Update/Fix Some Docs;

Fix warnings from -Wempty-body, -Wunused-label, and -Wpointer-sign

.gitignore

@@ -2,3 +2,9 @@
 *.so*
 *.dylib
 build
+*.sh
+*.csv
+examples
+*.bin
+*.ans
+*.patch

CMakeLists.txt

@@ -1,11 +1,52 @@
+#Ubuntu 20.04 uses 3.16.3
+#Ubuntu 22.04 uses 3.22.1
+#Arch currently on 3.26.3
+#Cygwin currently using 3.23.2 (or newer)
+cmake_minimum_required(VERSION 3.10.2)
 project(dsd-fme)
-cmake_minimum_required(VERSION 2.8.11)
 
 SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake/")
 #Set curses to ncurses, and wide true for ascii
 set(CURSES_NEED_NCURSES TRUE)
 set(CURSES_NEED_WIDE TRUE)
 
+#use cmake option -DAERO=ON to enable Aero Builds (OSS support and specific tweaks)
+option(AERO
+    "Build for Aero Environments (Cygwin)" OFF)
+if (AERO)
+    add_definitions(-DAERO_BUILD) 
+endif ()
+
+#use cmake option -DCOLORS=OFF to disable color output
+option(COLORS
+    "Build with Colors Enabled" ON)
+if (COLORS)
+    add_definitions(-DPRETTY_COLORS) 
+endif ()
+
+#use cmake option -DPVC=ON to enable Provoice Conventional Frame Sync
+option(PVC
+    "Build with Provoice Conventional Frame Sync Enabled" OFF)
+if (PVC)
+    add_definitions(-DPVCONVENTIONAL) 
+endif ()
+
+
+#use cmake option -DLZ=ON to enable LimaZulu Requested NXDN Tweaks
+option(LZ
+    "Build with new LimaZulu Requested NXDN Tweaks Enabled" OFF)
+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) 
+endif ()
+
+
 include(git_revision)
 git_describe(GIT_TAG)
 
@@ -14,7 +55,8 @@ find_package(MBE REQUIRED)
 find_package(ITPP REQUIRED)
 find_package(RTLSDR)
 find_package(Curses REQUIRED) 
-find_package(PULSEAUDIO REQUIRED)
+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} ${CURSES_LIBRARY})
@@ -26,6 +68,12 @@ if(RTLSDR_FOUND)
     add_definitions(-DUSE_RTLSDR)
 endif(RTLSDR_FOUND)
 
+if(CODEC2_FOUND)
+    include_directories(SYSTEM ${CODEC2_INCLUDE_DIRS})
+    list(APPEND LIBS ${CODEC2_LIBRARIES})
+    add_definitions(-DUSE_CODEC2)
+endif(CODEC2_FOUND)
+
 FILE(GLOB SRCS src/*.c src/*.cpp)
 FILE(GLOB HEADERS include/*.h include/*.hpp)
 
@@ -41,6 +89,9 @@ 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>)
+
 include(GNUInstallDirs)
 install(TARGETS dsd-fme DESTINATION ${CMAKE_INSTALL_BINDIR})
 

COPYRIGHT

@@ -27,3 +27,7 @@ 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.
+
+# Digital Speech Decoder - Florida Man Edition
+
+This version of DSD is a flavor blend of [szechyjs](https://github.com/szechyjs/dsd "szechyjs") RTL branch and some of my own additions, along with portions of DMR and NXDN code from the [LouisErigHerve](https://github.com/LouisErigHerve/dsd "LouisErigHerve") branch. This code also borrows snippets, inspiration, and ideas from other open source works including [Boatbod OP25](https://github.com/boatbod/op25 "Boatbod OP25"), [DSDcc](https://github.com/f4exb/dsdcc "DSDcc"), [SDTRunk](https://github.com/DSheirer/sdrtrunk "SDRTrunk"), [MMDVMHost](https://github.com/g4klx/MMDVMHost "MMDVMHost"), [LFSR](https://github.com/mattames/LFSR "LFSR"), and [EZPWD-Reed-Solomon](https://github.com/pjkundert/ezpwd-reed-solomon "EZPWD"). 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 and hrh17 for the many hours of wav samples submitted by them.

README.md

@@ -1,251 +1,18 @@
+
 # Digital Speech Decoder - Florida Man Edition
 
-This version of DSD is a flavor blend of [szechyjs](https://github.com/szechyjs/dsd "szechyjs") RTL branch and some of my own additions, along with portions of DMR and NXDN code from the [LouisErigHerve](https://github.com/LouisErigHerve/dsd "LouisErigHerve") branch. This code also borrows snippets, inspiration, and ideas from other open source works including [Boatbod OP25](https://github.com/boatbod/op25 "Boatbod OP25"), [DSDcc](https://github.com/f4exb/dsdcc "DSDcc"), [SDTRunk](https://github.com/DSheirer/sdrtrunk "SDRTrunk"), [MMDVMHost](https://github.com/g4klx/MMDVMHost "MMDVMHost"), [LFSR](https://github.com/mattames/LFSR "LFSR"), and [EZPWD-Reed-Solomon](https://github.com/pjkundert/ezpwd-reed-solomon "EZPWD"). 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 and hrh17 for the many hours of wav samples submitted by them.
+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.
 
-## 2022.10.01 Update ##
+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. Thanks to volo-zyko for cleaning up a lot of code. Thank you everybody.
 
-Very Experimental (Mostly Just Sampling Speed and using built in QPSK demodulator) for Phase 2 CQPSK 6000 sps input over disc tap inputs (SDR++, GQRX, WAV files). Promising results, but some errors in decoding as expected. I've had some pretty good luck using SDR++ to listen to and decode Duke Energy TDMA Control Channel through the virtual sink. Experimental CQPSK can be toggled in Ncurses Menu and also via command line switch `-f2 -m2` but keep in mind this will only work with Phase 2 RF channels using CQPSK, and not a combined decoding.
+![DSD-FME](https://github.com/lwvmobile/dsd-fme/blob/audio_work/dsd-fme2.png)
 
-Also, added some new iden_up PDUs and other odd and end P25 PDU's (still far from complete). Ncurses Terminal and Console output will now show relevant frequencies for CC and Voice channels if iden_up commands are present.
+![DSD-FME](https://github.com/lwvmobile/dsd-fme/blob/audio_work/dsd-fme3.png)
 
-DSD-FME, and The Florida Man Labs will be taking a hiatus period from straigth development of this project. Currently, I feel we are at a bit of a stand still as far as what can be done with the project without new demodulation, dibit buffer, audio, and input methods. DSD-FME will continue to receive maintenance updates for simple bug fixes and also any major bug issues that cause crashing, etc., but I am reluctant to continue developing with the current underlying issues mentioned above. I am going to go into a period of hiatus with this project and do lots of experimentation, learning, and testing to see what viable options are out there or need to be created from scratch. I feel like I've learned a lot, achieved a lot, made tons of mistakes, learned from a few of them, but ultimately improved on the DSD project. DSD-FME will continue to receive replies and support in any opened issues but will currently only extend to help in setting up and using the software, on top of regular minor maintenance and any crash related issues.
+## Information
-
-## 2022.09.28 Mini Update ##
-Back by popular demand, I've re-implemented DMR Stereo as a standalone decoder. DMR Stereo is also still available in XDMA decoding for P25 1, 2, and DMR BS/MS Simplex as well.
-
-DMR Stereo `dsd-fme -fs` 
-XDMA       `dsd-fme -ft` 
-
-It can also be selected in the NCurses Terminal Menu. Sadly I had to remove the X2-TDMA decoder option in the menu, I'm sure nobody will miss it.
-
-## 2022.09.17 Update ##
-P25 Phase 2 Audio decoding has been implemented into DSD-FME. Currently, Phase 2 will only work from OP25 symbol capture bin files, or from wav files/SDR applications/RTL input that are sourced from FSK4 sources. CQPSK (LSM/H-D8PSK) will not work from audio sources. With the addition of Phases 2 audio, a new default decoder class has been implemented, XDMA, which is P25 Phase 1, Phase 2, DMR BS and MS (DMR Stereo). Furthermore, very limited Phase 1 TSBK support and Phase 2 FACCH/SACCH/LCCH has been worked in just to get Network Status Broadcasts, which can fill in the required P2 parameters for WACN, SYSID, and CC for Phase 2 frame de-scrambling, and active voice call information.
-
-With the implementation of the XDMA decoder class (default decoder), the CLI switches for DMR Stereo has been repurposed. -T option will now open a per call wav file saving when used with NCurses Terminal, otherwise it will write wav files to slot 1 and slot 2 wav files.
-
-Anybody using `dsd-fme -fr -T` ...... should now just use `dsd-fme -ft` instead!
-
-To see the up to date CLI options, please look at the help options with the -h CLI option.
-
-## 2022.08.12 Update ##
-A new menu system has been introduced in the NCURSES Terminal. Also includes support for LRRP to text file type of choice and reading OP25 symbol capture bin files.
-
-[![DSD-FME](https://github.com/lwvmobile/dsd-fme/blob/pulseaudio/dsd-fme.png)](https://www.youtube.com/watch?v=TqTfAfaPJ4s "DSD-FME Update 2022.08.12")
-
-To get started with the new menu system, simply launch with:
-
-`dsd-fme -N 2> log.txt`
-
-## 2022.06.20 Update - Current Users Please Read!! ##
-The executable for this project has been changed from `dsd` to `dsd-fme` so after pulling or cloning the lastest version, make sure to call the software with `dsd-fme`.
-
-## 2022.05.05 Update ##
-DMR Stereo method added for listening to voice audio in both TDMA channels/slots simultaneously.
-
-### Example Usage and Note!
-`dsd-fme` or `./dsd-fme` may need to be used in your usage, depending on if you are running it from the build folder, or if you have run make install. You will need to tweak the examples to your particular usage. Users can always check `dsd-fme -h`  for help and all command line switches to use.
-
-`dsd-fme` is all you need to run for pulse input, pulse output, and auto detect for DMR BS/MS, P25 (1 and 2) and X2-TDMA decoding. 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 (P25 1 and 2, DMR BS/MS, X2-TDMA)
--fs DMR Stereo BS/MS Simplex
--fa Legacy Auto
--fi NXDN48
--fn NXDN96
--fp ProVoice
--fm dPMR, also may need to use -xd if inverted dPMR.
--fr DMR, also may need to use -xr if inverted DMR.
--f1 P25P1
--fx X2-TDMA
-```
-
-## Example Usage - New XDMA Decoder, Ncurses Terminal, Pulse Input/Output, and Log Console to file
-`dsd-fme -ft -N 2> voice.log`
-
-and in a second terminal tab, same folder, run
-
-`tail -n 40 -f voice.log`
-
-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)
-
-## Example Usage - RTL2832 Dongle Input
-`dsd-fme -fi -i rtl -c 154.9875M -P -2 -D 1 -G 36 -L 70 -U 6021 -Y 12`
-
-```
--i rtl to use rtl_fm (default is -i pulse for pulse audio)
-
--o pulse to set output to pulse audio (excluded, is default anyways)
-
--c Set frequency
-
--P set PPM error (default = 0)
-
--D set device index number (default = 0; first device detected)
-
--G set device gain (0-49) (default = 0 Auto Gain)
-
--L set rtl squelch to 70 (default = 0; off)
-
--U set UDP port for rtl_fm remote control (default = 6020)
-
--Y 12 set rtl VFO bandwidth in kHz, (default = 12)(6, 8, 12, 16, 24, 48)
-
-```
-## Example STDIN UDP from GQRX or SDR++, output to Pulse Audio, and append decoded audio to wav file
-Be sure to first start UDP output sink in GQRX or SDR++ and set VFO appropriately
-
-`socat stdio udp-listen:7355 | dsd-fme -fi -i - -w nxdn.wav`
-
-## Example Usage - Extra Information for Academic Study and Logging
-
-`dsd-fme -Z -N 2>> voice.log`
-
-and in a second terminal tab, same folder, run
-
-`tail -n 40 -f voice.log`
-
-![DSD-FME](https://github.com/lwvmobile/dsd-fme/blob/pulseaudio/dsd-fme2.png)
-
-## Roadmap
-The Current list of objectives include:
-
-1. New demodulators and input method(s) (considering liquid-dsp).
-
-2. Graphical User Interface (may need to migrate to new project).
-
-3. Lots of experimentation.
-
-## How to clone, check out, and build this branch
-
-### 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 22.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/pulseaudio/download-and-install.sh
-chmod +x download-and-install.sh
-./download-and-install.sh
-```
-
-If you have dependencies already installed (i.e. need a fresh clean install on a system with DSD-FME already or using system other than Debian/Ubuntu, etc), please run this instead:
-
-```
-wget https://raw.githubusercontent.com/lwvmobile/dsd-fme/pulseaudio/download-and-install-nodeps.sh
-chmod +x download-and-install-nodeps.sh
-./download-and-install-nodeps.sh
-```
-
-### Ubuntu 18.04/LM19/Buster Note:
-The above install.sh should now function on older system types. You can elect to manually follow the steps down below. Do NOT Manually build and install ITPP 4.3.1 on older systems, it is currently not wanting to build on Ubuntu 18.04 and Linux Mint 19. Install it from the repository instead.
-
-## Manual Install
-
-First, install dependency packages. This guide will assume you are using Debian/Ubuntu based distros. Check your package manager for equivalent packages if different.
-
-```
-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
-```
-## Headless
-
-If running headless, swap out pavucontrol for pulsemixer, and also install pulseaudio as well. Attempting to install pavucontrol in a headless environment may attempt to install a minimal desktop environment. Note: Default behavior of pulseaudio in a headless environment may be to be muted, so check by opening pulsemixer and unmuting and routing audio appropriately.
-
-```
-sudo apt install libpulse-dev 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 pulsemixer pulseaudio
-```
-
-### Build and Install ITPP - ONLY IF NOT IN REPO!!
-
-```
-wget -O itpp-latest.tar.bz2 http://sourceforge.net/projects/itpp/files/latest/download?source=files
-tar xjf itpp*
-#if you can't cd into this folder, double check folder name first
-cd itpp-4.3.1
-mkdir build
-cd build
-cmake ..
-make -j `nproc`
-sudo make install
-sudo ldconfig
-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") This version of MBELib is 1.3.1 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 issues with printing over the screen in future builds.
-
-```
-git clone https://github.com/lwvmobile/mbelib
-cd mbelib
-mkdir build
-cd build
-cmake ..
-make -j `nproc`
-sudo make install
-sudo ldconfig
-cd ..
-cd ..
-```
-
-Finish by running these steps to clone and build DSD-FME w/ pulseaudio support.
-
-```
-git clone https://github.com/lwvmobile/dsd-fme
-cd dsd-fme
-git branch -a
-git checkout remotes/origin/pulseaudio
-git checkout -b pulseaudio
-git branch -a #double check to see if you are on pulseaudio branch
-sudo cp tone8.wav /usr/share/
-sudo cp tone24.wav /usr/share/
-sudo chmod 777 /usr/share/tone8.wav
-sudo chmod 777 /usr/share/tone24.wav
-mkdir build
-cd build
-cmake ..
-make -j `nproc`
-##only run make install if you don't have another version already installed##
-sudo make install
-sudo ldconfig
-
-```
-Optional 'Virtual Sinks' for routing audio from SDR++ or GQRX, Media Players, etc. into DSD-FME
-
-You may wish to direct sound into DSD-FME via Virtual Sinks. You may set up a Virtual Sink or two on your machine for routing audio in and out of applications to other applications using the following command, and opening up pavucontrol "PulseAudio Volume Control" in the menu (or `pulsemixer` in headless mode) to change line out of application to virtual sink, and line in of DSD-FME to monitor of virtual sink. This command will not persist past a reboot, so you will need to invoke them each time you reboot, or search for how to add this to your conf files for persistency if desired.
-
-```
-pacmd load-module module-null-sink sink_name=virtual_sink  sink_properties=device.description=Virtual_Sink
-pacmd load-module module-null-sink sink_name=virtual_sink2  sink_properties=device.description=Virtual_Sink2
-```
-
-Already have this branch, and just want to pull the latest build? You can run the rebuild.sh file in the dsd-fme folder, or manually do the pull with the commands:
-
-```
-##Open your clone folder##
-git pull https://github.com/lwvmobile/dsd-fme pulseaudio
-##cd into your build folder##
-cd build
-cmake ..
-make -j `nproc`
-sudo make install
-sudo ldconfig
-```
-
-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.
-
-```
-sudo cp tone8.wav /usr/share/
-sudo cp tone24.wav /usr/share/
-sudo chmod 777 /usr/share/tone8.wav
-sudo chmod 777 /usr/share/tone24.wav
-```
-
-# Join the Conversation
-
-Want to help drive the direction of this project and read more about the latest updates and releases to DSD-FME? Then join the conversation on the 'unofficial official' [DSD-FME](https://forums.radioreference.com/threads/dsd-fme.438137/ "DSD-FME") Forum Thread on the Radio Reference Forums.
 
+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").
 
 ## License
 Copyright (C) 2010 DSD Author
@@ -262,3 +29,4 @@ GPG Key ID: 0x3F1D7FD0 (74EF 430D F7F2 0A48 FCE6  F630 FAA2 635D 3F1D 7FD0)
     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.
+

cmake/FindCODEC2.cmake

@@ -0,0 +1,31 @@
+# - Try to find CODEC2
+# Once done this will define
+
+#Seems to work on Cygwin as well now -- more testing for may be required
+# Not sure what causes the 'Package 'codec2', required by 'virtual:world', not found' message, but seems to work anyways
+# -- Checking for module 'codec2'
+# --   Package 'codec2', required by 'virtual:world', not found
+# -- Found CODEC2: /usr/local/lib/libcodec2.dll.a
+
+if (NOT CODEC2_FOUND)
+
+  find_package(PkgConfig)
+  pkg_check_modules(CODEC2_PKG codec2)
+  set(CODEC2_DEFINITIONS ${PC_CODEC2_CFLAGS_OTHER})
+
+  find_path(CODEC2_INCLUDE_DIR
+    NAMES codec2/codec2.h codec2.h
+    HINTS ${CODEC2_PKG_INCLUDE_DIRS})
+
+  find_library(CODEC2_LIBRARY
+    NAMES codec2/codec2 codec2
+    HINTS ${CODEC2_PKG_LIBRARY_DIRS})
+
+  set(CODEC2_LIBRARIES ${CODEC2_LIBRARY})
+  set(CODEC2_INCLUDE_DIRS ${CODEC2_INCLUDE_DIR})
+
+  include(FindPackageHandleStandardArgs)
+  find_package_handle_standard_args(CODEC2 DEFAULT_MSG CODEC2_LIBRARY CODEC2_INCLUDE_DIR)
+  mark_as_advanced(CODEC2_INCLUDE_DIR CODEC2_LIBRARY)
+
+endif (NOT CODEC2_FOUND)

download-and-install-Arch.sh

@@ -0,0 +1,52 @@
+#! /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
+
+  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
+
+  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/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
+
+  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"
+
+else
+  printf "Sorry, you cannot build DSD-FME without acknowledging the Patent Notice.\n\n"
+fi

download-and-install-nodeps.sh

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

download-and-install.sh

@@ -1,70 +1,44 @@
 #! /bin/bash
+#
+cdir=$(pwd)
 clear
-echo DSD-FME Digital Speech Decoder - Florida Man Edition Auto Installer
+printf "Digital Speech Decoder: Florida Man Edition - Auto Installer\n
-echo MBELib is considered a requirement on this build.
+MBELib is considered a requirement on this build.
-echo You must view this notice prior to continuing. 
+You must view the Patent Notice prior to continuing.
-echo The Patent Notice can be found at the site below.
+The Patent Notice can be found at the site below.
-echo https://github.com/lwvmobile/mbelib#readme
+https://github.com/lwvmobile/mbelib#readme
-echo Please confirm that you have viewed the patent notice by entering y below.
+Please confirm that you have viewed the patent notice by entering y below:\n\n"
-echo
+read -p "Have you viewed the patent notice? y/N " ANSWER
-echo y/N
+ANSWER=$(printf "$ANSWER"|tr '[:upper:]' '[:lower:]')
-read ANSWER
+if [ "$ANSWER" = "y" ]; then
-Y='y'
+  sudo apt update
-if [[ $Y == $ANSWER ]]; then
+  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")
-sudo apt update
+  if [ "$chkitpp" -lt "1" ];then 
-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
+    printf "\nFor some reason, ITPP did NOT install!\nYou may have to manually install it.\n\n"
-
+    read -p "Press Enter to exit..." x
-echo ITPP Manual Build and Install has been temporarily removed from this script due to issues with older versions of Ubuntu.
+    exit 1
-echo Please check to see that libitpp-dev has successfully been downloaded and installed from the repo.
+  fi
-read -p "Press enter to continue"
+  git clone https://github.com/lwvmobile/mbelib
-
+  cd mbelib
-#wget -O itpp-latest.tar.bz2 http://sourceforge.net/projects/itpp/files/latest/download?source=files
+  git checkout ambe_tones
-#tar xjf itpp*
+  mkdir build
-#if you can't cd into this folder, double check folder name first
+  cd build
-#cd itpp-4.3.1 
+  cmake ..
-#mkdir build
+  make -j $(nproc)
-#cd build
+  sudo make install
-#cmake ..
+  sudo ldconfig
-#make -j `nproc`
+  cd $cdir
-#sudo make install
+  git clone https://github.com/lwvmobile/dsd-fme
-#sudo ldconfig
+  cd dsd-fme
-#cd ..
+  #git checkout audio_work
-#cd ..
+  mkdir build
-
+  cd build
-git clone https://github.com/lwvmobile/mbelib
+  cmake ..
-cd mbelib
+  make -j $(nproc)
-mkdir build
+  sudo make install
-cd build
+  sudo ldconfig
-cmake ..
-make -j `nproc`
-sudo make install
-sudo ldconfig
-cd ..
-cd ..
-
-git clone https://github.com/lwvmobile/dsd-fme
-cd dsd-fme
-git branch -a
-git checkout remotes/origin/pulseaudio
-git checkout -b pulseaudio
-git branch -a #double check to see if you are on pulseaudio branch
-sudo cp tone8.wav /usr/share/
-sudo cp tone24.wav /usr/share/
-sudo chmod 777 /usr/share/tone8.wav
-sudo chmod 777 /usr/share/tone24.wav
-mkdir build
-cd build
-cmake ..
-make -j `nproc`
-##only run make install if you don't have another version already installed##
-sudo make install
-sudo ldconfig
-
 else
-echo
+  printf "\nSorry, you cannot build DSD-FME without acknowledging the Patent Notice.\nExiting...\n\n"
-echo Sorry, you cannot build DSD-FME without acknowledging the Patent Notice.
+  exit 2
-fi
+fi
-
-
-

examples/Example_Usage.md

@@ -0,0 +1,272 @@
+### 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. 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)
+-fs DMR Stereo, also may need to use -xr if inverted DMR
+-fa Legacy Auto (not recommended)
+-fi NXDN48
+-fn NXDN96
+-fp EDACS/Provoice
+-fm dPMR, also may need to use -xd if inverted dPMR.
+-f1 P25P1
+-f2 P25P2 (may need to specify wacn/sys/nac manually if traffic channel)
+-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. 
+
+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.
+
+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` 
+
+To scan through NXDN48 only conventional, use: 
+`dsd-fme -fi -i tcp -C channel_map.csv -Y -U 4532 -N 2> log.ans` 
+
+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.
+
+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.
+
+## Trunking Examples
+Please see trunking.sh for sample start up scripts or scroll down to the bottom for more explanation.
+
+## Example Usage - Default Decoder, Ncurses Terminal, Pulse Input/Output, and Log Console to file
+`dsd-fme -N 2> voice.log`
+
+and in a second terminal tab, same folder, run
+
+`tail -n 40 -f voice.log`
+
+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 ###
+
+--TCP Direct Audio Link with SDR++
+
+`dsd-fme -i tcp` Currently defaults to localhost:7355 (SDR++ defaults)
+
+`dsd-fme -i tcp:192.168.7.5:7356` (remote host and custom port)
+
+--48000/9600 Mono Wav File Input
+
+`dsd-fme -i filename.wav` 48k/1 Audio (SDR++, GQRX wav recordings)
+
+`dsd-fme -i filename.wav -s 96000` 96k/1 (DSDPlus Raw Signal Wav Files)
+
+Wav File Input Note: Due to 96000 rate audio requiring me to double the symbol rate and center, be sure to use the -s 96000 at the very end of the startup command. Also, some NXDN48/96 may have difficulties decoding properly with wav file input. 
+
+## Example Usage - RTL2832 Dongle Input
+Short Setup (all default values):
+
+`dsd-fme -i rtl`
+
+Detailed Setup:
+
+`dsd-fme -ft -i rtl:0:154.9875M:26:-2:8:0:6020 `
+
+```
+RTL-SDR options:
+ 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) 
+  gain <num>    RTL-SDR Device Gain (0-49)(default = 0; Hardware AGC recommended)
+  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)
+  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
+
+```
+
+## Example Usage - Extra Payload/PDU Logging
+
+`dsd-fme -Z -N 2> log.ans`
+
+and in a second terminal tab, same folder, run
+
+`tail -n 40 -f log.ans`
+
+### EDACS/P25/NXDN/DMR Simple/Single VFO Trunking ###
+
+EDACS Trunking (w/ channel map import)
+
+--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 -fp -C channel_map.csv -G group.csv -T -U 4532 -N 2> log.ans`
+
+--NXDN48 Trunking (standard band plan) with SDR++ (untested for frequency accuracy)
+
+`dsd-fme -fi -i tcp -T -U 4532 -N 2> log.ans`
+
+--NXDN48 Trunking (w/ channel map import) with SDR++ (put control channel frequency at channel 0 in channel_map.csv)
+
+`dsd-fme -fi -i tcp -T -U 4532 -C channel_map.csv -N 2> log.ans`
+
+--DMR Trunking (w/ channel map import) with SDR++ (put control channel frequency at channel 0 (TIII and Con+) in channel_map.csv)
+
+`dsd-fme -fs -i tcp -T -U 4532 -C channel_map.csv -N 2> log.ans`
+
+--P25 Trunking P1 and P2 (C4FM) with SDR++ 
+
+`dsd-fme -i tcp -T -U 4532 -N 2> log.ans`
+
+--P25 Trunking (QPSK) with P1 Control Channel (Should switch symbol rate and center on Phase 2 audio channels)
+
+`dsd-fme -i tcp -T -U 4532 -N -mq 2> log.ans`
+
+--P25 Trunking Phase 2 TDMA Control Channel systems with QPSK (non Phase 1 systems)
+
+`dsd-fme -i tcp -T -U 4532 -N -f2 -m2 2> log.ans`
+
+Trunking Note1: All samples above can also be run with the RTL input method and setting of RTL UDP remote port. In terms of performance, however, SDR++ will do a much better job on weaker/marginal signal compared to the RTL input. RTL input should only be used on strong signal.
+
+`dsd-fme -fp -i rtl:0:851.8M:22:-2:24:0:6020 -T -C channel_map.csv -G group.csv -N 2> log.ans`
+
+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.
+
+```
+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
+
+```
+
+Use channel 75 in your import file, which would correspond to dsdplus channels 151 and 152 (151 = TS1 / 152 = TS2).
+
+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.
+
+Trunking Note4: NXDN Trunking v1 will require a channel map. Please see the example folder for an appropriate channel map. NOTICE: NXDN trunking has been fixed on the RTL (rtl_fm) input method and works correctly now using a soft squelch value to determine when to look for frame sync. Tests show this works very well, but squelch adjustments may be required to differentiate the noise floor from the signal.
+
+NXDN Trunking Update: NXDN DFA (Direct Frequency Assignment) has been coded from the v2 documents, so using a channel map may not be required, as long as the DFA is configured with standard values, and not 'system definable' values. This will only work on trunking systems that use DFA (newer systems) in accordance to the v2 CAI document NXDN TS 1-A Version 2.0 September 2016. If the system uses 'system definable' values, then make sure to put the channels in a channel map csv file as as the 16-bit OFN values for proper tuning.
+
+NXDN Type-D/IDAS Update: Type-D or IDAS decoding/trunking has been coded now and tested on a small two channel system. Set up a channel map much like Type-C trunking. If preferred, insert channel 31 at the top of your channel map for the 'home repeater' or go to channel of choice during a TX_REL or DISC message. Extensive testing of Type-D has not been conducted. Some cavaets may currently include iffy per call wav file saving and potentially shifting SRC and TGT ID values due to how SCCH messages are handled and how Busy Repeater Messages are handled. Private calls will need to be enabled by enabling 'data calls', if desired. During testing, only data calls came on private calls, so this was set to disabled by default, but can be enabled with data calls enabled. Also, note that some home repeater channels may or may not carry calls from all systems.
+
+Channel Map and Group CSV Note: Leave the top line of the channel_map.csv and group.csv as the label, do not delete the line, if no line is there, dsd_import skips the first line so it will not import the first channel or first group in those files if there is something there that isn't a label. 
+
+Hytera XPT: Code has been added for XPT system slco/flco/csbk decoding and trunking. The setup will be similar to Capacity Plus trunking in the csv file, listing each LSN channel to a frequency (see examples/hytera_xpt_chan.csv). Currently, this set up is working with smaller XPT systems that I have been able to test with.
+
+## NCurses Keyboard Shortcuts ##
+
+Some Keyboard Shortcuts have been implemented for testing to see how users like them. Just hope nobody pushes a key on accident and doesn't know which one it was or what it does. The current list of keyboard shortcuts include:
+
+```
+esc or arrow keys - ncurses menu
+q - quit
+c - toggle compact mode
+h - toggle call history
+z - toggle console payloads
+a - toggle call alert beep
+4 - force privacy/scrambler key assertion over enc identifiers (dmr and nxdn)
+6 - force rc4 key assertion over missing pi header/le enc identifiers (dmr)
+i - toggle signal inversion on types that can't auto detect (dmr, dpmr)
+m - toggle c4fm/qpsk 10/4 (everything but phase 2 signal)
+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
+P - start per call decoded wav files (Capital 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
+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)
+d - Toggle Trunking Tuning to Data Calls (DMR T3, NXDN)
+e - Toggle Trunking Tuning to Encrypted Calls (P25)
+8 - Connect to SDR++ TCP Audio Sink with Defaults/Retry Sink Connection on Disconnect
+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 (Testing/WIP: DMR T3 Only)
+l - Hold TG in Slot 2 on TDMA Systems, or clear current hold (Testing/WIP: DMR T3 Only)
+
+```
+
+## 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
+```
+
+## Sending Audio to a Icecast 2 Server via FFmpeg (Linux w/ Pulse Audio)
+
+`pactl list short sources`
+
+Choose Desired Device to Cast:
+
+```
+0 auto_null.monitor       module-null-sink.c      s16le 2ch 48000Hz       IDLE
+1	alsa_output.pci-0000_0d_00.3.analog-stereo.monitor	module-alsa-card.c	s16le 2ch 44100Hz	RUNNING
+2	alsa_input.pci-0000_0d_00.3.analog-stereo	module-alsa-card.c	s16le 2ch 44100Hz	RUNNING
+3	virtual_sink.monitor	module-null-sink.c	s16le 2ch 44100Hz	RUNNING
+4	virtual_sink2.monitor	module-null-sink.c	s16le 2ch 44100Hz	RUNNING
+7	alsa_output.pci-0000_0b_00.1.hdmi-stereo-extra1.monitor	module-alsa-card.c	s16le 2ch 44100Hz	RUNNING
+```
+
+Example: 
+
+```
+francis@12cores:~$ pactl list short sources
+0       auto_null.monitor       module-null-sink.c      s16le 2ch 48000Hz       IDLE
+francis@12coresx:~$ ffmpeg -f pulse -i 0 -c:a libmp3lame -ab 64k -f mp3 icecast://source:password@XXXXXXXXX:8000
+
+
+```
+
+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.

examples/Install_Notes.md

@@ -0,0 +1,205 @@
+## How to clone and build this branch
+
+### 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
+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
+chmod +x download-and-install-Arch.sh
+./download-and-install-Arch.sh
+```
+
+### Other:
+
+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
+chmod +x download-and-install-nodeps.sh
+./download-and-install-nodeps.sh
+```
+
+## Manual Install
+
+First, install dependency packages. This guide will assume you are using Debian/Ubuntu based distros. Check your package manager for equivalent packages if different.
+
+Debian/Mint/Ubuntu/Pi
+
+```
+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
+```
+
+Fedora 36/37 -- from https://github.com/lwvmobile/dsd-fme/issues/99
+
+```
+sudo dnf update
+sudo dnf install libsndfile-devel fftw-devel lapack-devel rtl-sdr-devel pulseaudio-libs-devel libusb-devel cmake git ncurses ncurses-devel gcc wget pavucontrol gcc-c++ codec2-devel
+```
+
+Arch -- https://github.com/lwvmobile/dsd-fme/issues/153 and https://github.com/lwvmobile/dsd-fme/issues/153
+
+```
+sudo pacman -Syu
+sudo pacman -S libpulse cmake ncurses lapack perl fftw rtl-sdr codec2 base-devel libsndfile git wget rtl-sdr
+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
+```
+
+## Headless Ubuntu Server/Pi
+
+If running headless, swap out pavucontrol for pulsemixer, and also install pulseaudio as well. Attempting to install pavucontrol in a headless environment may attempt to install a minimal desktop environment. Note: Default behavior of pulseaudio in a headless environment may be to be muted, so check by opening pulsemixer and unmuting and routing audio appropriately.
+
+```
+sudo apt install libpulse-dev 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 pulsemixer pulseaudio libcodec2-dev
+```
+
+### Build and Install ITPP - ONLY IF NOT IN REPO!!
+
+```
+wget -O itpp-latest.tar.bz2 http://sourceforge.net/projects/itpp/files/latest/download?source=files
+tar xjf itpp*
+#if you can't cd into this folder, double check folder name first
+cd itpp-4.3.1
+mkdir build
+cd build
+cmake ..
+make -j `nproc`
+sudo make install
+sudo ldconfig
+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") 
+
+```
+git clone https://github.com/lwvmobile/mbelib
+git checkout ambe_tones
+cd mbelib
+mkdir build
+cd build
+cmake ..
+make -j `nproc`
+sudo make install
+sudo ldconfig
+cd ..
+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
+```
+
+Finish by running these steps to clone and build DSD-FME.
+
+```
+git clone https://github.com/lwvmobile/dsd-fme
+cd dsd-fme
+mkdir build
+cd build
+cmake ..
+make -j `nproc`
+sudo make install
+sudo ldconfig
+
+```
+
+### Windows Cygwin Builds
+
+If using RTL input support, you must install libusb-win32 before proceeding with Cygwin installation. You will also need to build and compile a version of librtlsdr, but this can be tricky, and personally, I had to resort to using a much older version of the source code to get it to build at all with the rtl support in the precompiled 'Aero' builds.
+
+Then install all dependencies available in the repo prior to building, either directly selecting them during setup with the setup-x86.exe or setup-x64.exe or by issuing a command similar to this:
+
+```
+setup-x64.exe --packages libpulse-devel,libpulse-mainloop-glib0,libpulse-simple0,libpulse0,pulseaudio,pulseaudio-debuginfo,pulseaudio-equalizer,pulseaudio-module-x11,pulseaudio-module-zeroconf,pulseaudio-utils,sox-fmt-pulseaudio,xfce-pulseaudio-plugin,libusb0,libusb1.0,libusb1.0-debuginfo,libusb1.0-devel,libncurses++w10,libncurses-devel,libncursesw10,ncurses,cmake,gcc-core,gcc-debuginfo,gcc-objc,git,make,socat,sox,sox-fmt-ao,unzip,wget,gcc-g++,libsndfile-devel
+```
+
+Then manually install ITPP and MBElib, see above install notes. Be sure to run `cp libmbe* /usr/lib` after compiling MBElib.
+
+Then you can build and install using
+
+```
+git clone https://github.com/lwvmobile/dsd-fme
+cd dsd-fme
+mkdir build
+cd build
+# -DAERO=ON is optional, but recommended if you want the older OSS support as well
+cmake -DAERO=ON ..
+make
+make install
+```
+
+### Virtual Sinks
+
+You may wish to direct sound into DSD-FME via Virtual Sinks. You may set up a Virtual Sink or two on your machine for routing audio in and out of applications to other applications using the following command, and opening up pavucontrol "PulseAudio Volume Control" in the menu (or `pulsemixer` in headless mode) to change line out of application to virtual sink, and line in of DSD-FME to monitor of virtual sink. This command will not persist past a reboot, so you will need to invoke them each time you reboot, or search for how to add this to your conf files for persistency if desired. Note: This setup is completely optional if using TCP Network Sink Audio and/or RTL Input.
+
+```
+pactl load-module module-null-sink sink_name=virtual_sink  sink_properties=device.description=Virtual_Sink
+pactl load-module module-null-sink sink_name=virtual_sink2  sink_properties=device.description=Virtual_Sink2
+```
+
+Already have this branch, and just want to pull the latest build? You can run the rebuild.sh file in the dsd-fme folder, or manually do the pull with the commands:
+
+```
+##Open your clone folder##
+git pull
+##cd into your build folder##
+cd build
+cmake ..
+make -j `nproc`
+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.
+
+```
+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.

examples/capacity_plus_chan.csv

@@ -0,0 +1,10 @@
+LSN(dec),frequency(Hz) (do not delete this line or won't import properly)
+1,858606250
+2,858606250
+3,859606250
+4,859606250
+5,860606250
+6,860606250
+7,861606250
+8,861606250
+

examples/connect_plus_chan.csv

@@ -0,0 +1,19 @@
+ChannelNumber(dec),frequency(Hz) (do not delete this line or won't import properly)
+999,862093750,default cc (come here first), optional use non-existent channel as first entry
+1,863093750
+2,862093750
+3,861093750
+4,860093750
+5,859093750
+6,863593750
+7,862593750
+8,861593750
+9,860593750
+10,859593750
+11,863393750
+12,862393750
+13,861393750
+14,860393750
+15,859393750
+
+

examples/dmr_t3_chan.csv

@@ -0,0 +1,8 @@
+ChannelNumber(dec),frequency(Hz) (do not delete this line or won't import properly)
+999,456318750,default cc (come here first), optional use non-existent channel as first entry
+36,455756250
+54,455981250
+81,456318750
+
+
+

examples/edacs_channel_map.csv

@@ -0,0 +1,6 @@
+LSN(dec),frequency(Hz) (do not delete this line or won't import properly)
+1,851375000
+2,851800000
+3,855987500
+4,858487500
+5,852312500

examples/group.csv

@@ -0,0 +1,5 @@
+DEC,Mode(A- Allow, B - Block, DE - Digital Enc),Name of Group,Tag (do not delete this line or won't import properly)
+100,B,Example Name,Tag
+1449,A,Fire Dispatch,Fire
+929,A,Fire Tac,Fire
+22033,DE,Law Dispatch,Law

examples/hytera_xpt_chan.csv

@@ -0,0 +1,10 @@
+LSN(dec),frequency(Hz) (do not delete this line or won't import properly)
+1,858606250
+2,858606250
+3,859606250
+4,859606250
+5,860606250
+6,860606250
+7,861606250
+8,861606250
+

examples/multi_key.csv

@@ -0,0 +1,6 @@
+key id or tg id (dec), key number or value (dec) //NXDN Scrambler, BP, 10-char Hytera BP only
+2,70
+1,123
+100,70
+12,48713912656
+672560,254

examples/multi_key_hex.csv

@@ -0,0 +1,5 @@
+key id(hex), key value (hex) //10-char Hytera BP, RC4
+1,1234567890
+2,ABCDEF1234
+C,0B57935150
+64,0B57935150

examples/nxdn_chan_map.csv

@@ -0,0 +1,8 @@
+channel(dec), freq(Hz)
+141,423862500
+142,424337500
+143,424912500
+203,424100000
+204,424625000
+271,422650000
+302,423287500

examples/nxdn_sc_key.csv

@@ -0,0 +1,5 @@
+key(dec) or tg(dec), value(dec), load any single keys as key 0
+0,23466
+1,12345
+2,32700
+63,32767

examples/trunking.sh

@@ -0,0 +1,45 @@
+#example trunking sh scripts (SDR++ with RIGCTL and RTL Input)
+#make sure to put a # in front of all lines except the one you wish to use
+
+#P25 P1 FDMA CC with C4FM 
+#dsd-fme -i tcp -U 4532 -T -N 2> log.ans
+#dsd-fme -i rtl:0:850M:0:-2:12 -T -N 2> log.ans
+
+#P25 P1 FDMA CC with QPSK (Simulcast) 
+#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 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
+
+#DMR TIII, Con+, Cap+, XPT
+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/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
+#dsd-fme -fi -i rtl:0:855.625M:0:-2:12:100 -T -C nxdn_channel_map.csv -N 2> log.ans
+
+#NXDN48 Type-C Trunking with DFA
+#dsd-fme -fi -i tcp -T -U 4532 -N 2> log.ans
+#dsd-fme -fi -i rtl:0:855.625M:0:-2:12:100 -T -N 2> log.ans
+
+#NXDN96 Trunking with Channel Map
+#dsd-fme -fn -i tcp -T -U 4532 -C nxdn_channel_map.csv -N 2> log.ans
+#dsd-fme -fn -i rtl -T -C nxdn_channel_map.csv -N 2> log.ans
+
+#Notes: parameters after -i tcp can be omitted if using localhost as the default hostname to connect
+#and 7355 as the default port number. -U is the port number for RIGCTL and will mirror the tcp hostname
+#running under the assumption that the user will be connnecting the VFO to the same instance of SDR++
+#You can also specify an ip address to connect to a remote SDR++ instance, make sure that the settings
+#inside of SDR++ match, i.e., change in SDR++ from 'localhost' to an IP to bind to (machine's IP address)
+
+#Note2: RTL input should only be used on strong signal, the SDR++ VFO will perform much better on marginal signal
+#paramters after -i rtl can also be omitted now if using the default configurations
+
+#Having a -G group.csv is purely optional, but useful if you want to block groups, or give groups names

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 switch
-	}; // end for
+	} // end for
 
 return(length);
 }; // end function

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;

include/nxdn96_const.h

@@ -1,62 +0,0 @@
-/*
- * 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.
- */
-
-/*
- * NXDN AMBE interleave schedule
- */
-
-#ifndef _MAIN
-extern const int nW[36];
-extern const int nX[36];
-extern const int nY[36];
-extern const int nZ[36];
-
-#else
-
-const int nW[36] = { 0, 1, 0, 1, 0, 1,
-  0, 1, 0, 1, 0, 1,
-  0, 1, 0, 1, 0, 1,
-  0, 1, 0, 1, 0, 2,
-  0, 2, 0, 2, 0, 2,
-  0, 2, 0, 2, 0, 2
-};
-
-const int nX[36] = { 23, 10, 22, 9, 21, 8,
-  20, 7, 19, 6, 18, 5,
-  17, 4, 16, 3, 15, 2,
-  14, 1, 13, 0, 12, 10,
-  11, 9, 10, 8, 9, 7,
-  8, 6, 7, 5, 6, 4
-};
-
-const int nY[36] = { 0, 2, 0, 2, 0, 2,
-  0, 2, 0, 3, 0, 3,
-  1, 3, 1, 3, 1, 3,
-  1, 3, 1, 3, 1, 3,
-  1, 3, 1, 3, 1, 3,
-  1, 3, 1, 3, 1, 3
-};
-
-const int nZ[36] = { 5, 3, 4, 2, 3, 1,
-  2, 0, 1, 13, 0, 12,
-  22, 11, 21, 10, 20, 9,
-  19, 8, 18, 7, 17, 6,
-  16, 5, 15, 4, 14, 3,
-  13, 2, 12, 1, 11, 0
-};
-
-#endif

include/nxdn_const.h

@@ -1,257 +1,82 @@
-/*
+// Portions Below from Osmocom OP25
- * Copyright (C) 2010 DSD Author
+// NXDN Encoder (C) Copyright 2019 Max H. Parke KA1RBI
- * GPG Key ID: 0x3F1D7FD0 (74EF 430D F7F2 0A48 FCE6  F630 FAA2 635D 3F1D 7FD0)
+// thx gr-ysf fr_vch_decoder_bb_impl.cc * Copyright 2015 Mathias Weyland *
- *
+// OP25 is free software; you can redistribute it and/or modify it
- * Permission to use, copy, modify, and/or distribute this software for any
+// under the terms of the GNU General Public License as published by
- * purpose with or without fee is hereby granted, provided that the above
+// the Free Software Foundation; either version 3, or (at your option)
- * copyright notice and this permission notice appear in all copies.
+// any later version.
- *
+// 
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+// OP25 is distributed in the hope that it will be useful, but WITHOUT
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+// License for more details.
- * 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
+// You should have received a copy of the GNU General Public License
- * PERFORMANCE OF THIS SOFTWARE.
+// along with OP25; see the file COPYING. If not, write to the Free
- */
+// Software Foundation, Inc., 51 Franklin Street, Boston, MA
+// 02110-1301, USA.
 
-#ifndef _MAIN
+static const uint8_t PERM_12_5[] = {
-extern const int nW[36];
+	0,12,24,36,48,
-extern const int nX[36];
+	1,13,25,37,49,
-extern const int nY[36];
+	2,14,26,38,50,
-extern const int nZ[36];
+	3,15,27,39,51,
-extern const char nxdnpr[145];
+	4,16,28,40,52,
-extern const char nxdnpr2[145]; //why is this 145 but referenced later as 182 or 384
+	5,17,29,41,53,
-//borrow from LEH
+	6,18,30,42,54,
-extern const unsigned char nsW[72];
+	7,19,31,43,55,
-extern const int DSDNXDN_SACCH_m_Interleave[60];
+	8,20,32,44,56,
-extern const int DSDNXDN_SACCH_m_PunctureList[12];
+	9,21,33,45,57,
-extern const int DSDNXDN_FACCH1_m_Interleave[144];
+	10,22,34,46,58,
-extern const int DSDNXDN_FACCH1_m_PunctureList[48];
+	11,23,35,47,59
-extern const int DSDNXDN_UDCH_m_Interleave[348];
-extern const int DSDNXDN_UDCH_m_PunctureList[58];
-//
-//enum
-//{
-#define   NXDN_VCALL           0b000001  /* VCALL = VCALL_REQ = VCALL_RESP */
-#define   NXDN_VCALL_IV        0b000011
-#define   NXDN_DCALL_HDR       0b001001  /* Header Format - NXDN_DCALL_HDR = NXDN_DCALL_REQ = NXDN_DCALL_RESP */
-#define   NXDN_DCALL_USR       0b001011  /* User Data Format */
-#define   NXDN_DCALL_ACK       0b001100
-#define   NXDN_REL_EX          0b000111
-#define   NXDN_HEAD_DLY        0b001111
-#define   NXDN_SDCALL_REQ_HDR  0b111000  /* Header Format */
-#define   NXDN_SDCALL_REQ_USR  0b111001  /* User Data Format */
-#define   NXDN_SDCALL_RESP     0b111011
-#define   NXDN_SDCALL_IV       0b111010
-#define   NXDN_STAT_INQ_REQ    0b110000
-#define   NXDN_STAT_INQ_RESP   0b110001
-#define   NXDN_STAT_REQ        0b110010
-#define   NXDN_STAT_RESP       0b110011
-#define   NXDN_REM_CON_REQ     0b110100
-#define   NXDN_REM_CON_RESP    0b110101
-#define   NXDN_REM_CON_E_REQ   0b110110
-#define   NXDN_REM_CON_E_RESP  0b110111
-//NXDN_VCALL_REQ       = 0b000001,  /* VCALL = VCALL_REQ = VCALL_RESP */
-//NXDN_VCALL_RESP      = 0b000001,  /* VCALL = VCALL_REQ = VCALL_RESP */
-#define   NXDN_VCALL_REC_REQ   = 0b000010  /* NXDN_VCALL_REC_REQ = NXDN_VCALL_REC_RESP */
-//NXDN_VCALL_REC_RESP  = 0b000010,
-#define   NXDN_VCALL_CONN_REQ  = 0b000011  /* NXDN_VCALL_CONN_REQ = NXDN_VCALL_CONN_RESP */
-//NXDN_VCALL_CONN_RESP = 0b000011,  /* NXDN_VCALL_CONN_REQ = NXDN_VCALL_CONN_RESP */
-#define   NXDN_VCALL_ASSGN_DUP = 0b000101
-//NXDN_DCALL_REQ       = 0b001001,  /* NXDN_DCALL_HDR = NXDN_DCALL_REQ = NXDN_DCALL_RESP */
-//NXDN_DCALL_RESP      = 0b001001,  /* NXDN_DCALL_HDR = NXDN_DCALL_REQ = NXDN_DCALL_RESP */
-#define   NXDN_DCALL_REC_REQ   = 0b001010  /* NXDN_DCALL_REC_REQ = NXDN_DCALL_REC_RESP */
-//NXDN_DCALL_REC_RESP  = 0b001010,  /* NXDN_DCALL_REC_REQ = NXDN_DCALL_REC_RESP */
-#define   NXDN_DCALL_ASSGN     = 0b001110
-#define   NXDN_DCALL_ASSGN_DUP = 0b001101
-#define   NXDN_IDLE            0b010000
-#define   NXDN_DISC_REQ        = 0b010001  /* NXDN_DISC_REQ = NXDN_DISC */
-#define   NXDN_DISC            = 0b010001   /* NXDN_DISC_REQ = NXDN_DISC */
-
-
-#else
-/*
- *  pseudorandom bit sequence
- */
-const char nxdnpr[145] = { 1, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0, 1, 0, 1, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 0, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 1, 1, 0, 0, 0, 1 };
-//const unsigned char nxdnpr2[384] =
-const unsigned char nxdnpr2[182] = //generated from default in manual with the x^9+x^4+1 poly?
-{
-  0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 0, 1, 0, 1, 0,
-  1, 1, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 0, 1, 0,
-  0, 1, 1, 0, 1, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 1,
-  0, 0, 0, 0, 1, 0, 1, 0, 1, 1, 0, 1, 0, 0, 1, 1,
-  1, 1, 1, 1, 0, 1, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1,
-  0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 1,
-  1, 0, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0,
-  0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1,
-  0, 0, 0, 1, 1, 0, 1, 0, 0, 1, 0, 1, 1, 1, 1, 1,
-  1, 1, 0, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0, 1, 1,
-  1, 0, 1, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1,
-  1, 1, 0, 0, 0, 1//, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1,
-//  0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 1, 0, 1, 1, 0,
-//  1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0,
-//  1, 0, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0,
-//  0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 1, 1,
-//  1, 1, 0, 0, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0,
-//  0, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1,
-//  0, 0, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 1, 0, 1,
-//  0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1,
-//  1, 1, 0, 0, 0, 0, 1, 0, 1, 1, 1, 1, 0, 1, 1, 0,
-//  1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 1, 1, 1, 0,
-//  1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1,
-//  1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1
-};
-/*
- * NXDN AMBE interleave schedule
- */
-const int nW[36] = { 0, 1, 0, 1, 0, 1,
-  0, 1, 0, 1, 0, 1,
-  0, 1, 0, 1, 0, 1,
-  0, 1, 0, 1, 0, 2,
-  0, 2, 0, 2, 0, 2,
-  0, 2, 0, 2, 0, 2
 };
 
-const int nX[36] = { 23, 10, 22, 9, 21, 8,
+static const uint8_t PERM_16_9[] = {
-  20, 7, 19, 6, 18, 5,
+	0, 16, 32, 48, 64, 80, 96, 112, 128,
-  17, 4, 16, 3, 15, 2,
+	1, 17, 33, 49, 65, 81, 97, 113, 129,
-  14, 1, 13, 0, 12, 10,
+	2, 18, 34, 50, 66, 82, 98, 114, 130,
-  11, 9, 10, 8, 9, 7,
+	3, 19, 35, 51, 67, 83, 99, 115, 131,
-  8, 6, 7, 5, 6, 4
+	4, 20, 36, 52, 68, 84, 100, 116, 132,
+	5, 21, 37, 53, 69, 85, 101, 117, 133,
+	6, 22, 38, 54, 70, 86, 102, 118, 134,
+	7, 23, 39, 55, 71, 87, 103, 119, 135,
+	8, 24, 40, 56, 72, 88, 104, 120, 136,
+	9, 25, 41, 57, 73, 89, 105, 121, 137,
+	10, 26, 42, 58, 74, 90, 106, 122, 138,
+	11, 27, 43, 59, 75, 91, 107, 123, 139,
+	12, 28, 44, 60, 76, 92, 108, 124, 140,
+	13, 29, 45, 61, 77, 93, 109, 125, 141,
+	14, 30, 46, 62, 78, 94, 110, 126, 142,
+	15, 31, 47, 63, 79, 95, 111, 127, 143
 };
 
-const int nY[36] = { 0, 2, 0, 2, 0, 2,
+static const uint16_t PERM_12_25[] = {
-  0, 2, 0, 3, 0, 3,
+	0,12,24,36,48,60,72,84,96,108,120,132,144,156,168,180,192,204,216,228,240,252,264,276,288,
-  1, 3, 1, 3, 1, 3,
+	1,13,25,37,49,61,73,85,97,109,121,133,145,157,169,181,193,205,217,229,241,253,265,277,289,
-  1, 3, 1, 3, 1, 3,
+	2,14,26,38,50,62,74,86,98,110,122,134,146,158,170,182,194,206,218,230,242,254,266,278,290,
-  1, 3, 1, 3, 1, 3,
+	3,15,27,39,51,63,75,87,99,111,123,135,147,159,171,183,195,207,219,231,243,255,267,279,291,
-  1, 3, 1, 3, 1, 3
+	4,16,28,40,52,64,76,88,100,112,124,136,148,160,172,184,196,208,220,232,244,256,268,280,292,
+	5,17,29,41,53,65,77,89,101,113,125,137,149,161,173,185,197,209,221,233,245,257,269,281,293,
+	6,18,30,42,54,66,78,90,102,114,126,138,150,162,174,186,198,210,222,234,246,258,270,282,294,
+	7,19,31,43,55,67,79,91,103,115,127,139,151,163,175,187,199,211,223,235,247,259,271,283,295,
+	8,20,32,44,56,68,80,92,104,116,128,140,152,164,176,188,200,212,224,236,248,260,272,284,296,
+	9,21,33,45,57,69,81,93,105,117,129,141,153,165,177,189,201,213,225,237,249,261,273,285,297,
+	10,22,34,46,58,70,82,94,106,118,130,142,154,166,178,190,202,214,226,238,250,262,274,286,298,
+	11,23,35,47,59,71,83,95,107,119,131,143,155,167,179,191,203,215,227,239,251,263,275,287,299
 };
 
-const int nZ[36] = { 5, 3, 4, 2, 3, 1,
+static const uint16_t PERM_12_29[] = {
-  2, 0, 1, 13, 0, 12,
+	0,12,24,36,48,60,72,84,96,108,120,132,144,156,168,180,192,204,216,228,240,252,264,276,288,300,312,324,336,
-  22, 11, 21, 10, 20, 9,
+	1,13,25,37,49,61,73,85,97,109,121,133,145,157,169,181,193,205,217,229,241,253,265,277,289,301,313,325,337,
-  19, 8, 18, 7, 17, 6,
+	2,14,26,38,50,62,74,86,98,110,122,134,146,158,170,182,194,206,218,230,242,254,266,278,290,302,314,326,338,
-  16, 5, 15, 4, 14, 3,
+	3,15,27,39,51,63,75,87,99,111,123,135,147,159,171,183,195,207,219,231,243,255,267,279,291,303,315,327,339,
-  13, 2, 12, 1, 11, 0
+	4,16,28,40,52,64,76,88,100,112,124,136,148,160,172,184,196,208,220,232,244,256,268,280,292,304,316,328,340,
+	5,17,29,41,53,65,77,89,101,113,125,137,149,161,173,185,197,209,221,233,245,257,269,281,293,305,317,329,341,
+	6,18,30,42,54,66,78,90,102,114,126,138,150,162,174,186,198,210,222,234,246,258,270,282,294,306,318,330,342,
+	7,19,31,43,55,67,79,91,103,115,127,139,151,163,175,187,199,211,223,235,247,259,271,283,295,307,319,331,343,
+	8,20,32,44,56,68,80,92,104,116,128,140,152,164,176,188,200,212,224,236,248,260,272,284,296,308,320,332,344,
+	9,21,33,45,57,69,81,93,105,117,129,141,153,165,177,189,201,213,225,237,249,261,273,285,297,309,321,333,345,
+	10,22,34,46,58,70,82,94,106,118,130,142,154,166,178,190,202,214,226,238,250,262,274,286,298,310,322,334,346,
+	11,23,35,47,59,71,83,95,107,119,131,143,155,167,179,191,203,215,227,239,251,263,275,287,299,311,323,335,347
 };
 
-/*
- * NXDN SACCH interleave
- */
-const unsigned char nsW[72] = {
-  0, 12, 24, 36, 48, 60,
-  1, 13, 25, 37, 49, 61,
-  2, 14, 26, 38, 50, 62,
-  3, 15, 27, 39, 51, 63,
-  4, 16, 28, 40, 52, 64,
-  5, 17, 29, 41, 53, 65,
-  6, 18, 30, 42, 54, 66,
-  7, 19, 31, 43, 55, 67,
-  8, 20, 32, 44, 56, 68,
-  9, 21, 33, 45, 57, 69,
-  10,22, 34, 46, 58, 70,
-  11,23, 35, 47, 59, 71
-};
-
-const int DSDNXDN_SACCH_m_Interleave[60] =
-{
-  0, 12, 24, 36, 48,
-  1, 13, 25, 37, 49,
-  2, 14, 26, 38, 50,
-  3, 15, 27, 39, 51,
-  4, 16, 28, 40, 52,
-  5, 17, 29, 41, 53,
-  6, 18, 30, 42, 54,
-  7, 19, 31, 43, 55,
-  8, 20, 32, 44, 56,
-  9, 21, 33, 45, 57,
-  10, 22, 34, 46, 58,
-  11, 23, 35, 47, 59,
-};
-
-const int DSDNXDN_SACCH_m_PunctureList[12] = { 5, 11, 17, 23, 29, 35, 41, 47, 53, 59, 65, 71 };
-
-const unsigned int DSDNXDN_FACCH1_m_Interleave[144] =
-{
-  0,  16, 32, 48, 64, 80, 96,  112, 128,
-  1,  17, 33, 49, 65, 81, 97,  113, 129,
-  2,  18, 34, 50, 66, 82, 98,  114, 130,
-  3,  19, 35, 51, 67, 83, 99,  115, 131,
-  4,  20, 36, 52, 68, 84, 100, 116, 132,
-  5,  21, 37, 53, 69, 85, 101, 117, 133,
-  6,  22, 38, 54, 70, 86, 102, 118, 134,
-  7,  23, 39, 55, 71, 87, 103, 119, 135,
-  8,  24, 40, 56, 72, 88, 104, 120, 136,
-  9,  25, 41, 57, 73, 89, 105, 121, 137,
-  10, 26, 42, 58, 74, 90, 106, 122, 138,
-  11, 27, 43, 59, 75, 91, 107, 123, 139,
-  12, 28, 44, 60, 76, 92, 108, 124, 140,
-  13, 29, 45, 61, 77, 93, 109, 125, 141,
-  14, 30, 46, 62, 78, 94, 110, 126, 142,
-  15, 31, 47, 63, 79, 95, 111, 127, 143,
-};
-
-const unsigned int DSDNXDN_FACCH1_m_PunctureList[48] =
-{
-    1U,   5U,   9U,  13U,  17U,  21U,  25U,  29U,  33U,  37U,
-   41U,  45U,  49U,  53U,  57U,  61U,  65U,  69U,  73U,  77U,
-   81U,  85U,  89U,  93U,  97U, 101U, 105U, 109U, 113U, 117U,
-  121U, 125U, 129U, 133U, 137U, 141U, 145U, 149U, 153U, 157U,
-  161U, 165U, 169U, 173U, 177U, 181U, 185U, 189U
-};
-
-const int DSDNXDN_UDCH_m_Interleave[348] = {
-    0, 12, 24, 36, 48, 60, 72, 84, 96, 108, 120, 132, 144, 156, 168, 180, 192, 204, 216, 228, 240, 252, 264, 276, 288, 300, 312, 324, 336,
-    1, 13, 25, 37, 49, 61, 73, 85, 97, 109, 121, 133, 145, 157, 169, 181, 193, 205, 217, 229, 241, 253, 265, 277, 289, 301, 313, 325, 337,
-    2, 14, 26, 38, 50, 62, 74, 86, 98, 110, 122, 134, 146, 158, 170, 182, 194, 206, 218, 230, 242, 254, 266, 278, 290, 302, 314, 326, 338,
-    3, 15, 27, 39, 51, 63, 75, 87, 99, 111, 123, 135, 147, 159, 171, 183, 195, 207, 219, 231, 243, 255, 267, 279, 291, 303, 315, 327, 339,
-    4, 16, 28, 40, 52, 64, 76, 88, 100, 112, 124, 136, 148, 160, 172, 184, 196, 208, 220, 232, 244, 256, 268, 280, 292, 304, 316, 328, 340,
-    5, 17, 29, 41, 53, 65, 77, 89, 101, 113, 125, 137, 149, 161, 173, 185, 197, 209, 221, 233, 245, 257, 269, 281, 293, 305, 317, 329, 341,
-    6, 18, 30, 42, 54, 66, 78, 90, 102, 114, 126, 138, 150, 162, 174, 186, 198, 210, 222, 234, 246, 258, 270, 282, 294, 306, 318, 330, 342,
-    7, 19, 31, 43, 55, 67, 79, 91, 103, 115, 127, 139, 151, 163, 175, 187, 199, 211, 223, 235, 247, 259, 271, 283, 295, 307, 319, 331, 343,
-    8, 20, 32, 44, 56, 68, 80, 92, 104, 116, 128, 140, 152, 164, 176, 188, 200, 212, 224, 236, 248, 260, 272, 284, 296, 308, 320, 332, 344,
-    9, 21, 33, 45, 57, 69, 81, 93, 105, 117, 129, 141, 153, 165, 177, 189, 201, 213, 225, 237, 249, 261, 273, 285, 297, 309, 321, 333, 345,
-    10, 22, 34, 46, 58, 70, 82, 94, 106, 118, 130, 142, 154, 166, 178, 190, 202, 214, 226, 238, 250, 262, 274, 286, 298, 310, 322, 334, 346,
-    11, 23, 35, 47, 59, 71, 83, 95, 107, 119, 131, 143, 155, 167, 179, 191, 203, 215, 227, 239, 251, 263, 275, 287, 299, 311, 323, 335, 347,
-};
-
-const int DSDNXDN_UDCH_m_PunctureList[58] = {
-    3, 11,
-    17, 25,
-    31, 39,
-    45, 53,
-    59, 67,
-    73, 81,
-    87, 95,
-    101, 109,
-    115, 123,
-    129, 137,
-    143, 151,
-    157, 165,
-    171, 179,
-    185, 193,
-    199, 207,
-    213, 221,
-    227, 235,
-    241, 249,
-    255, 263,
-    269, 277,
-    283, 291,
-    297, 305,
-    311, 319,
-    325, 333,
-    339, 347,
-    353, 361,
-    367, 375,
-    381, 389,
-    395, 403,
-};
-
-//#endif /* _MAIN */
-
-
-
-#endif

install.sh

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

patch/dmr_data_voice_call_tg_src_persistency_ncurses2.patch

@@ -0,0 +1,120 @@
+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/enable_both_slots_p2_trunking.patch

@@ -0,0 +1,274 @@
+diff --git a/src/p25p2_vpdu.c b/src/p25p2_vpdu.c
+index 5155bd7..3cf0480 100644
+--- a/src/p25p2_vpdu.c
++++ b/src/p25p2_vpdu.c
+@@ -155,16 +155,16 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon
+ 
+ 							//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;
+-							}
++							// if (channel & 1) //VCH1
++							// {
++							// 	opts->slot1_on = 0;
++							// 	opts->slot2_on = 1;
++							// }
++							// else //VCH0
++							// {
++							// 	opts->slot1_on = 1;
++							// 	opts->slot2_on = 0;
++							// }
+ 
+ 						}
+ 					}
+@@ -255,16 +255,16 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon
+ 
+ 							//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;
+-							}
++							// if (channel & 1) //VCH1
++							// {
++							// 	opts->slot1_on = 0;
++							// 	opts->slot2_on = 1;
++							// }
++							// else //VCH0
++							// {
++							// 	opts->slot1_on = 1;
++							// 	opts->slot2_on = 0;
++							// }
+ 
+ 						}
+ 					}
+@@ -386,16 +386,16 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon
+ 
+ 								//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 (tunable_chan & 1) //VCH1
+-								{
+-									opts->slot1_on = 0;
+-									opts->slot2_on = 1;
+-								}
+-								else //VCH0
+-								{
+-									opts->slot1_on = 1;
+-									opts->slot2_on = 0;
+-								}
++								// if (tunable_chan & 1) //VCH1
++								// {
++								// 	opts->slot1_on = 0;
++								// 	opts->slot2_on = 1;
++								// }
++								// else //VCH0
++								// {
++								// 	opts->slot1_on = 1;
++								// 	opts->slot2_on = 0;
++								// }
+ 
+ 							}
+ 						}
+@@ -511,16 +511,16 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon
+ 
+ 							//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;
+-							}
++							// if (channel & 1) //VCH1
++							// {
++							// 	opts->slot1_on = 0;
++							// 	opts->slot2_on = 1;
++							// }
++							// else //VCH0
++							// {
++							// 	opts->slot1_on = 1;
++							// 	opts->slot2_on = 0;
++							// }
+ 
+ 						}
+ 					}
+@@ -642,16 +642,16 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon
+ 
+ 							//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;
+-							}
++							// if (channel & 1) //VCH1
++							// {
++							// 	opts->slot1_on = 0;
++							// 	opts->slot2_on = 1;
++							// }
++							// else //VCH0
++							// {
++							// 	opts->slot1_on = 1;
++							// 	opts->slot2_on = 0;
++							// }
+ 						}
+ 
+ 					}
+@@ -748,16 +748,16 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon
+ 
+ 							//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;
+-							}
++							// if (channel & 1) //VCH1
++							// {
++							// 	opts->slot1_on = 0;
++							// 	opts->slot2_on = 1;
++							// }
++							// else //VCH0
++							// {
++							// 	opts->slot1_on = 1;
++							// 	opts->slot2_on = 0;
++							// }
+ 						}
+ 
+ 					}
+@@ -918,16 +918,16 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon
+ 
+ 								//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 (tunable_chan & 1) //VCH1
+-								{
+-									opts->slot1_on = 0;
+-									opts->slot2_on = 1;
+-								}
+-								else //VCH0
+-								{
+-									opts->slot1_on = 1;
+-									opts->slot2_on = 0;
+-								}
++								// if (tunable_chan & 1) //VCH1
++								// {
++								// 	opts->slot1_on = 0;
++								// 	opts->slot2_on = 1;
++								// }
++								// else //VCH0
++								// {
++								// 	opts->slot1_on = 1;
++								// 	opts->slot2_on = 0;
++								// }
+ 
+ 							}
+ 						}
+@@ -1109,16 +1109,16 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon
+ 
+ 								//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 (tunable_chan & 1) //VCH1
+-								{
+-									opts->slot1_on = 0;
+-									opts->slot2_on = 1;
+-								}
+-								else //VCH0
+-								{
+-									opts->slot1_on = 1;
+-									opts->slot2_on = 0;
+-								}
++								// if (tunable_chan & 1) //VCH1
++								// {
++								// 	opts->slot1_on = 0;
++								// 	opts->slot2_on = 1;
++								// }
++								// else //VCH0
++								// {
++								// 	opts->slot1_on = 1;
++								// 	opts->slot2_on = 0;
++								// }
+ 
+ 							}
+ 						}
+@@ -1245,16 +1245,16 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon
+ 
+ 								//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 (tunable_chan & 1) //VCH1
+-								{
+-									opts->slot1_on = 0;
+-									opts->slot2_on = 1;
+-								}
+-								else //VCH0
+-								{
+-									opts->slot1_on = 1;
+-									opts->slot2_on = 0;
+-								}
++								// if (tunable_chan & 1) //VCH1
++								// {
++								// 	opts->slot1_on = 0;
++								// 	opts->slot2_on = 1;
++								// }
++								// else //VCH0
++								// {
++								// 	opts->slot1_on = 1;
++								// 	opts->slot2_on = 0;
++								// }
+ 
+ 							}
+ 						}
+@@ -1374,16 +1374,16 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon
+ 
+ 							//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 (channelt & 1) //VCH1
+-							{
+-								opts->slot1_on = 0;
+-								opts->slot2_on = 1;
+-							}
+-							else //VCH0
+-							{
+-								opts->slot1_on = 1;
+-								opts->slot2_on = 0;
+-							}
++							// if (channelt & 1) //VCH1
++							// {
++							// 	opts->slot1_on = 0;
++							// 	opts->slot2_on = 1;
++							// }
++							// else //VCH0
++							// {
++							// 	opts->slot1_on = 1;
++							// 	opts->slot2_on = 0;
++							// }
+ 							
+ 						}
+ 

patch/enable_pref_slots_p2_trunking.patch

@@ -0,0 +1,319 @@
+diff --git a/src/p25p1_mdpu.c b/src/p25p1_mdpu.c
+index 7d29860..00c1828 100644
+--- a/src/p25p1_mdpu.c
++++ b/src/p25p1_mdpu.c
+@@ -527,13 +527,13 @@ void processMPDU(dsd_opts * opts, dsd_state * state)
+                 //this will only occur in realtime tuning, not not required .bin or .wav playback
+                 if (channelt & 1) //VCH1
+                 {
+-                  opts->slot1_on = 0;
+-                  opts->slot2_on = 1;
++                  //opts->slot1_on = 0;
++                  opts->slot_preference = 1;
+                 }
+                 else //VCH0
+                 {
+-                  opts->slot1_on = 1;
+-                  opts->slot2_on = 0;
++                  opts->slot_preference = 0;
++                  //opts->slot2_on = 0;
+                 }
+ 
+               }
+@@ -644,13 +644,13 @@ void processMPDU(dsd_opts * opts, dsd_state * state)
+                 //this will only occur in realtime tuning, not not required .bin or .wav playback
+                 if (channelt & 1) //VCH1
+                 {
+-                  opts->slot1_on = 0;
+-                  opts->slot2_on = 1;
++                  //opts->slot1_on = 0;
++                  opts->slot_preference = 1;
+                 }
+                 else //VCH0
+                 {
+-                  opts->slot1_on = 1;
+-                  opts->slot2_on = 0;
++                  opts->slot_preference = 0;
++                  //opts->slot2_on = 0;
+                 }
+ 
+               }
+@@ -753,13 +753,13 @@ void processMPDU(dsd_opts * opts, dsd_state * state)
+                 //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;
++                  //opts->slot1_on = 0;
++                  opts->slot_preference = 1;
+                 }
+                 else //VCH0
+                 {
+-                  opts->slot1_on = 1;
+-                  opts->slot2_on = 0;
++                  opts->slot_preference = 0;
++                  //opts->slot2_on = 0;
+                 }
+               }
+ 
+@@ -876,13 +876,13 @@ void processMPDU(dsd_opts * opts, dsd_state * state)
+                   //this will only occur in realtime tuning, not not required .bin or .wav playback
+                   if (channelt & 1) //VCH1
+                   {
+-                    opts->slot1_on = 0;
+-                    opts->slot2_on = 1;
++                    //opts->slot1_on = 0;
++                    opts->slot_preference = 1;
+                   }
+                   else //VCH0
+                   {
+-                    opts->slot1_on = 1;
+-                    opts->slot2_on = 0;
++                    opts->slot_preference = 0;
++                    //opts->slot2_on = 0;
+                   }
+ 
+                 }
+diff --git a/src/p25p1_tsbk.c b/src/p25p1_tsbk.c
+index c801b7f..345335a 100644
+--- a/src/p25p1_tsbk.c
++++ b/src/p25p1_tsbk.c
+@@ -294,13 +294,13 @@ void processTSBK(dsd_opts * opts, dsd_state * state)
+                 //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;
++                  //opts->slot1_on = 0;
++                  opts->slot_preference = 1;
+                 }
+                 else //VCH0
+                 {
+-                  opts->slot1_on = 1;
+-                  opts->slot2_on = 0;
++                  opts->slot_preference = 0;
++                  //opts->slot2_on = 0;
+                 }
+ 
+               }
+diff --git a/src/p25p2_vpdu.c b/src/p25p2_vpdu.c
+index 468b71a..1b14d71 100644
+--- a/src/p25p2_vpdu.c
++++ b/src/p25p2_vpdu.c
+@@ -75,8 +75,6 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon
+ 
+ 		//Temp Fix: Disable Slot Playback when MAC_SIGNAL present (good CRC),
+ 		//during trunking, will re-enable when call grant is received, prevent lagging:
+-		if (opts->p25_trunk == 1 && opts->p25_is_tuned == 0) opts->slot1_on = 0;
+-		if (opts->p25_trunk == 1 && opts->p25_is_tuned == 0) opts->slot2_on = 0;
+ 
+ 		//TODO: Iron out issues with audio playing in every non SACCH slot when no voice present
+ 		//without it stuttering during actual voice
+@@ -156,13 +154,13 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon
+ 							//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;
++								//opts->slot1_on = 0;
++								opts->slot_preference = 1;
+ 							}
+ 							else //VCH0
+ 							{
+-								opts->slot1_on = 1;
+-								opts->slot2_on = 0;
++								opts->slot_preference = 0;
++								//opts->slot2_on = 0;
+ 							}
+ 
+ 						}
+@@ -256,13 +254,13 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon
+ 							//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;
++								//opts->slot1_on = 0;
++								opts->slot_preference = 1;
+ 							}
+ 							else //VCH0
+ 							{
+-								opts->slot1_on = 1;
+-								opts->slot2_on = 0;
++								opts->slot_preference = 0;
++								//opts->slot2_on = 0;
+ 							}
+ 
+ 						}
+@@ -387,13 +385,13 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon
+ 								//this will only occur in realtime tuning, not not required .bin or .wav playback
+ 								if (tunable_chan & 1) //VCH1
+ 								{
+-									opts->slot1_on = 0;
+-									opts->slot2_on = 1;
++									//opts->slot1_on = 0;
++									opts->slot_preference = 1;
+ 								}
+ 								else //VCH0
+ 								{
+-									opts->slot1_on = 1;
+-									opts->slot2_on = 0;
++									opts->slot_preference = 0;
++									//opts->slot2_on = 0;
+ 								}
+ 
+ 							}
+@@ -512,13 +510,13 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon
+ 							//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;
++								//opts->slot1_on = 0;
++								opts->slot_preference = 1;
+ 							}
+ 							else //VCH0
+ 							{
+-								opts->slot1_on = 1;
+-								opts->slot2_on = 0;
++								opts->slot_preference = 0;
++								//opts->slot2_on = 0;
+ 							}
+ 
+ 						}
+@@ -643,13 +641,13 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon
+ 							//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;
++								//opts->slot1_on = 0;
++								opts->slot_preference = 1;
+ 							}
+ 							else //VCH0
+ 							{
+-								opts->slot1_on = 1;
+-								opts->slot2_on = 0;
++								opts->slot_preference = 0;
++								//opts->slot2_on = 0;
+ 							}
+ 						}
+ 
+@@ -749,13 +747,13 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon
+ 							//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;
++								//opts->slot1_on = 0;
++								opts->slot_preference = 1;
+ 							}
+ 							else //VCH0
+ 							{
+-								opts->slot1_on = 1;
+-								opts->slot2_on = 0;
++								opts->slot_preference = 0;
++								//opts->slot2_on = 0;
+ 							}
+ 						}
+ 
+@@ -919,13 +917,13 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon
+ 								//this will only occur in realtime tuning, not not required .bin or .wav playback
+ 								if (tunable_chan & 1) //VCH1
+ 								{
+-									opts->slot1_on = 0;
+-									opts->slot2_on = 1;
++									//opts->slot1_on = 0;
++									opts->slot_preference = 1;
+ 								}
+ 								else //VCH0
+ 								{
+-									opts->slot1_on = 1;
+-									opts->slot2_on = 0;
++									opts->slot_preference = 0;
++									//opts->slot2_on = 0;
+ 								}
+ 
+ 							}
+@@ -1110,13 +1108,13 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon
+ 								//this will only occur in realtime tuning, not not required .bin or .wav playback
+ 								if (tunable_chan & 1) //VCH1
+ 								{
+-									opts->slot1_on = 0;
+-									opts->slot2_on = 1;
++									//opts->slot1_on = 0;
++									opts->slot_preference = 1;
+ 								}
+ 								else //VCH0
+ 								{
+-									opts->slot1_on = 1;
+-									opts->slot2_on = 0;
++									opts->slot_preference = 0;
++									//opts->slot2_on = 0;
+ 								}
+ 
+ 							}
+@@ -1246,13 +1244,13 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon
+ 								//this will only occur in realtime tuning, not not required .bin or .wav playback
+ 								if (tunable_chan & 1) //VCH1
+ 								{
+-									opts->slot1_on = 0;
+-									opts->slot2_on = 1;
++									//opts->slot1_on = 0;
++									opts->slot_preference = 1;
+ 								}
+ 								else //VCH0
+ 								{
+-									opts->slot1_on = 1;
+-									opts->slot2_on = 0;
++									opts->slot_preference = 0;
++									//opts->slot2_on = 0;
+ 								}
+ 
+ 							}
+@@ -1375,13 +1373,13 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon
+ 							//this will only occur in realtime tuning, not not required .bin or .wav playback
+ 							if (channelt & 1) //VCH1
+ 							{
+-								opts->slot1_on = 0;
+-								opts->slot2_on = 1;
++								//opts->slot1_on = 0;
++								opts->slot_preference = 1;
+ 							}
+ 							else //VCH0
+ 							{
+-								opts->slot1_on = 1;
+-								opts->slot2_on = 0;
++								opts->slot_preference = 0;
++								//opts->slot2_on = 0;
+ 							}
+ 							
+ 						}
+@@ -1498,13 +1496,13 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon
+ 							//this will only occur in realtime tuning, not not required .bin or .wav playback
+ 							if (channelt & 1) //VCH1
+ 							{
+-								opts->slot1_on = 0;
+-								opts->slot2_on = 1;
++								//opts->slot1_on = 0;
++								opts->slot_preference = 1;
+ 							}
+ 							else //VCH0
+ 							{
+-								opts->slot1_on = 1;
+-								opts->slot2_on = 0;
++								opts->slot_preference = 0;
++								//opts->slot2_on = 0;
+ 							}
+ 						}
+ 
+@@ -1516,9 +1514,6 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon
+ 							state->samplesPerSymbol = 10;
+ 							state->symbolCenter = 4;
+ 							opts->frame_p25p1 = 1; //enable, just in case it isn't already
+-
+-							//enable voice on slot 1 (just in case they start talking too, but probably won't)
+-							opts->slot1_on = 1;
+ 						} 
+ 
+ 					}

patch/g_dmr_per_call_wav_file_fixes_w_custom_wav_dir_20231226.patch

@@ -0,0 +1,461 @@
+diff --git a/src/dmr_csbk.c b/src/dmr_csbk.c
+index 129a087..0b7f4e2 100644
+--- a/src/dmr_csbk.c
++++ b/src/dmr_csbk.c
+@@ -424,6 +424,25 @@ 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
+@@ -443,6 +462,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 828de02..916eb62 100644
+--- a/src/dmr_flco.c
++++ b/src/dmr_flco.c
+@@ -10,6 +10,38 @@
+  *-----------------------------------------------------------------------------*/
+ 
+ #include "dsd.h"
++//I really just need to make ONE consolidated date and time function that works correctly
++char * getDateFLC(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;
++}
++
++//fix from YorgosTheodorakis fork -- https://github.com/YorgosTheodorakis/dsd-fme/commit/7884ee555521a887d388152b3b1f11f20433a94b
++char * getTimeFLC(void) //get pretty hhmmss timestamp
++{
++  char * curr = (char *) malloc(9);
++  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;
++}
+ 
+ //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)
+@@ -304,6 +336,14 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C
+         state->dmr_so = so;
+         state->lasttg = target;
+         state->lastsrc = source;
++        char * timestr;
++        timestr = getTimeFLC();
++        //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 - TG %d - RD %d", opts->wav_out_dir, getDateFLC(), timestr, state->dmr_color_code, target, source);
++          openWavOutFileL (opts, state);
++        }
+       }
+       if (state->currentslot == 1)
+       {
+@@ -311,6 +351,14 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C
+         state->dmr_soR = so;
+         state->lasttgR = target;
+         state->lastsrcR = source;
++        char * timestr;
++        timestr = getTimeFLC();
++        //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 - TG %d - RD %d", opts->wav_out_dir, getDateFLC(), timestr, state->dmr_color_code, target, source);
++          openWavOutFileR (opts, state);
++        }
+       }
+ 
+       //update cc amd vc sync time for trunking purposes (particularly Con+)
+@@ -337,6 +385,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 +404,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;
++        }
+       }
+       
+     }
+diff --git a/src/dsd_file.c b/src/dsd_file.c
+index 8e9094c..e8441ec 100644
+--- a/src/dsd_file.c
++++ b/src/dsd_file.c
+@@ -366,7 +366,7 @@ void closeMbeOutFile (dsd_opts * opts, dsd_state * state)
+       fclose (opts->mbe_out_f);
+       opts->mbe_out_f = NULL;
+       opts->mbe_out = 0;
+-      fprintf (stderr, "\nClosing MBE out file 1.\n");
++      // fprintf (stderr, "\nClosing MBE out file 1.\n");
+     }
+ 
+   }
+@@ -385,7 +385,7 @@ void closeMbeOutFileR (dsd_opts * opts, dsd_state * state)
+       fclose (opts->mbe_out_fR);
+       opts->mbe_out_fR = NULL;
+       opts->mbe_outR = 0;
+-      fprintf (stderr, "\nClosing MBE out file 2.\n");
++      // fprintf (stderr, "\nClosing MBE out file 2.\n");
+     }
+ 
+   }
+@@ -420,7 +420,7 @@ void openMbeOutFile (dsd_opts * opts, dsd_state * state)
+   }
+ 
+   state->tgcount = 0;
+-
++  //TODO: Change the date/time functions here to operate without using colons 
+   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);
+@@ -467,7 +467,7 @@ void openMbeOutFileR (dsd_opts * opts, dsd_state * state)
+   }
+ 
+   state->tgcount = 0;
+-
++  //TODO: Change the date/time functions here to operate without using colons 
+   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);
+@@ -557,6 +557,19 @@ void closeWavOutFile (dsd_opts * opts, dsd_state * state)
+   UNUSED(state);
+ 
+   sf_close(opts->wav_out_f);
++  char shell[2065], newfilename[1032];
++  int result;
++  sprintf (newfilename, "%s.wav", opts->wav_out_file);
++#ifdef AERO_BUILD
++  result = rename (opts->wav_out_file, newfilename);
++  UNUSED(shell);
++#else
++  sprintf (shell, "mv '%s' '%s'", opts->wav_out_file, newfilename);
++  result = system (shell);
++#endif
++  // fprintf (stderr, "\n Close WAV FileF %s; Result: %d \n", newfilename, result);
++  UNUSED(result);
++
+ }
+ 
+ void closeWavOutFileL (dsd_opts * opts, dsd_state * state)
+@@ -564,6 +577,19 @@ void closeWavOutFileL (dsd_opts * opts, dsd_state * state)
+   UNUSED(state);
+ 
+   sf_close(opts->wav_out_f);
++  char shell[2065], newfilename[1032];
++  int result;
++  sprintf (newfilename, "%s.wav", opts->wav_out_file);
++#ifdef AERO_BUILD
++  result = rename (opts->wav_out_file, newfilename);
++  UNUSED(shell);
++#else
++  sprintf (shell, "mv '%s' '%s'", opts->wav_out_file, newfilename);
++  result = system (shell);
++#endif
++  // fprintf (stderr, "\n Close WAV FileL %s; Result: %d \n", newfilename, result);
++  UNUSED(result);
++
+ }
+ 
+ void closeWavOutFileR (dsd_opts * opts, dsd_state * state)
+@@ -571,6 +597,18 @@ void closeWavOutFileR (dsd_opts * opts, dsd_state * state)
+   UNUSED(state);
+ 
+   sf_close(opts->wav_out_fR);
++  char shell[2065], newfilename[1032];
++  int result;
++  sprintf (newfilename, "%s.wav", opts->wav_out_fileR);
++#ifdef AERO_BUILD
++  result = rename (opts->wav_out_fileR, newfilename);
++  UNUSED(shell);
++#else
++  sprintf (shell, "mv '%s' '%s'", opts->wav_out_fileR, newfilename);
++  result = system (shell);
++#endif
++  // fprintf (stderr, "\n Close WAV FileR %s; Result: %d \n", newfilename, result);
++  UNUSED(result);
+ }
+ 
+ void closeWavOutFileRaw (dsd_opts * opts, dsd_state * state)
+diff --git a/src/dsd_main.c b/src/dsd_main.c
+index 1d2616b..c3a216d 100644
+--- a/src/dsd_main.c
++++ b/src/dsd_main.c
+@@ -107,6 +107,19 @@ 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
++
+ #ifdef AERO_BUILD
+ //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
+@@ -1568,9 +1581,9 @@ main (int argc, char **argv)
+   }
+ 
+   #ifdef AERO_BUILD
+-  fprintf (stderr, "Build Version: AW (20231015) \n");
++  fprintf (stderr, "Build Version: AW (20231214) 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 9f609ca..f23209c 100644
+--- a/src/dsd_mbe.c
++++ b/src/dsd_mbe.c
+@@ -1191,7 +1191,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);
+     }
+   }
+ 
+@@ -1201,7 +1202,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 4646e77..ab5497e 100644
+--- a/src/dsd_ncurses.c
++++ b/src/dsd_ncurses.c
+@@ -999,7 +999,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);
+@@ -2063,6 +2063,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
+     if (opts->dmr_stereo_wav == 1 && src != 0 ) //&& tgn != 0, some TG can be 0 on NXDN
+     {
+       //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 NXDN - RAN %d - TGT %d - SRC %d.wav", opts->wav_out_dir, getDateN(), timestr, rn, tgn, src);
+       openWavOutFileL (opts, state); //testing for now, will want to move to per call later
+@@ -2105,13 +2106,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)
+-    {
+-      //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, getDateN(), timestr, dcc, tg, rd);
+-      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)
+     {
+@@ -2126,7 +2128,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++)
+@@ -2147,14 +2149,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)
+-    {
+-      //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, getDateN(), timestr, dcc, tg, rd);
+-      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)
+     {
+@@ -2190,20 +2192,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)
+-    {
+-      //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, getDateN(), timestr, dcc, tgR, rdR);
+-      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", "");
+@@ -2275,7 +2278,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 (20231214)");
+     printw ("------------------------------------------------------------------------------\n"); 
+   }
+ #elif LIMAZULUTWEAKS
+@@ -2313,13 +2316,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 (20231214) \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 ");
++      if (i == 5) printw (" %s ", "AW G Build");
+       if (i == 6) printw (" %s \n", GIT_TAG);
+       #endif
+       else printw ("\n");
+@@ -3913,7 +3916,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/p25p2_superframe_18V_enc_check.patch

@@ -0,0 +1,769 @@
+diff --git a/include/dsd.h b/include/dsd.h
+index 0b47dee..f459528 100644
+--- a/include/dsd.h
++++ b/include/dsd.h
+@@ -437,8 +437,8 @@ typedef struct
+   //new stereo short sample storage
+   short s_l[160]; //single sample left
+   short s_r[160]; //single sample right
+-  short s_l4[4][160]; //quad sample for up to a P25p2 4V
+-  short s_r4[4][160]; //quad sample for up to a P25p2 4V
++  short s_l4[36][160]; //quad sample for up to a P25p2 4V
++  short s_r4[36][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
+@@ -654,6 +654,7 @@ 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
+@@ -926,6 +927,7 @@ void agf (dsd_opts * opts, dsd_state * state, float samp[160], int slot); //floa
+ 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 openAudioOutDevice (dsd_opts * opts, int speed);
+diff --git a/src/dsd_audio2.c b/src/dsd_audio2.c
+index a836afc..5eaf3c4 100644
+--- a/src/dsd_audio2.c
++++ b/src/dsd_audio2.c
+@@ -906,8 +906,31 @@ void playSynthesizedVoiceSS3 (dsd_opts * opts, dsd_state * state)
+   //CHEAT: Using the slot on/off, use that to set encL or encR back on
+   //as a simple way to turn off voice synthesis in a particular slot
+   //its not really 'disabled', we just aren't playing it
+-  if (opts->slot1_on == 0) encL = 1;
+-  if (opts->slot2_on == 0) encR = 1;
++  // if (opts->slot1_on == 0) encL = 1;
++  // if (opts->slot2_on == 0) encR = 1;
++
++  //this may have some unintended side effects that I haven't tested/explored yet, that's why its a patch only
++  //particularly in regards to 'Aero' Builds with their OSS Jank and slot_preference = 3 by default
++  //if rounds of testing in various scenaries looks good, I may expand this to P25p2 and the Float Variants as well
++  if (opts->slot1_on == 0 && opts->slot2_on == 1 && encR == 0) //slot 1 is hard off and slot 2 is on
++    memcpy (state->s_l4, state->s_r4, sizeof(state->s_l4)); //copy right to left
++  else if (opts->slot1_on == 1 && opts->slot2_on == 0 && encL == 0) //slot 2 is hard off and slot 1 is on
++    memcpy (state->s_r4, state->s_l4, sizeof(state->s_r4)); //copy left to right
++  else if (opts->slot_preference == 0 && state->dmrburstL == 16 && encL == 0) //slot 1 is preferred, and voice in slot 1
++    memcpy (state->s_r4, state->s_l4, sizeof(state->s_r4)); //copy left to right
++  else if (opts->slot_preference == 1 && state->dmrburstR == 16 && encR == 0) //slot 2 is preferred, and voice in slot 2
++    memcpy (state->s_l4, state->s_r4, sizeof(state->s_l4)); //copy right to left
++  else if (state->dmrburstL == 16 && state->dmrburstR != 16 && encL == 0) //voice in left, no voice in right
++    memcpy (state->s_r4, state->s_l4, sizeof(state->s_r4)); //copy left to right
++  else if (state->dmrburstR == 16 && state->dmrburstL != 16 && encR == 0) //voice in right, no voice in left
++    memcpy (state->s_l4, state->s_r4, sizeof(state->s_l4)); //copy right to left
++  //else if voice in both, and both slots on, and no preference on slot, then regular stereo interleave (left and right channels)
++
++  if (opts->slot1_on == 0 && opts->slot2_on == 0) //both slots are hard off, disable playback
++  {
++    encL = 1;
++    encR = 1;
++  }
+ 
+   //WIP: Mute if on B list (or not W list)
+   char modeL[8];
+@@ -944,12 +967,37 @@ void playSynthesizedVoiceSS3 (dsd_opts * opts, dsd_state * state)
+   if (strcmp(modeL, "B") == 0) encL = 1;
+   if (strcmp(modeR, "B") == 0) encR = 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)
++  if (strcmp(modeL, "A") == 0)
++  {
++    opts->slot1_on = 1;
++    opts->slot_preference = 0;
++  }
++  if (strcmp(modeR, "A") == 0)
++  {
++    opts->slot2_on = 1;
++    opts->slot_preference = 1;
++  }
++
+   //if TG Hold in place, mute anything but that TG #132
+-  if (state->tg_hold != 0 && state->tg_hold != TGL) encL = 1;
+-  if (state->tg_hold != 0 && state->tg_hold != TGR) encR = 1;
+-  //likewise, override and unmute if TG hold matches TG
+-  if (state->tg_hold != 0 && state->tg_hold == TGL) encL = 0;
+-  if (state->tg_hold != 0 && state->tg_hold == TGR) encR = 0;
++  if (state->tg_hold != 0 && state->tg_hold != TGL) 
++    encL = 1;
++  if (state->tg_hold != 0 && state->tg_hold != TGR)
++    encR = 1;
++  //likewise, override and unmute if TG hold matches TG (and turn on slot and set preference)
++  if (state->tg_hold != 0 && state->tg_hold == TGL)
++  {
++    encL = 0;
++    opts->slot1_on = 1;
++    opts->slot_preference = 0;
++  }
++  if (state->tg_hold != 0 && state->tg_hold == TGR)
++  {
++    encR = 0;
++    opts->slot2_on = 1;
++    opts->slot_preference = 1;
++  }
+ 
+   //interleave left and right channels from the short storage area
+   for (i = 0; i < 160; i++)
+@@ -1092,8 +1140,31 @@ void playSynthesizedVoiceSS4 (dsd_opts * opts, dsd_state * state)
+   //CHEAT: Using the slot on/off, use that to set encL or encR back on
+   //as a simple way to turn off voice synthesis in a particular slot
+   //its not really 'disabled', we just aren't playing it
+-  if (opts->slot1_on == 0) encL = 1;
+-  if (opts->slot2_on == 0) encR = 1;
++  // if (opts->slot1_on == 0) encL = 1;
++  // if (opts->slot2_on == 0) encR = 1;
++
++  //this may have some unintended side effects that I haven't tested/explored yet, that's why its a patch only
++  //particularly in regards to 'Aero' Builds with their OSS Jank and slot_preference = 3 by default
++  //if rounds of testing in various scenaries looks good, I may expand this to P25p2 and the Float Variants as well
++  if (opts->slot1_on == 0 && opts->slot2_on == 1 && encR == 0) //slot 1 is hard off and slot 2 is on
++    memcpy (state->s_l4, state->s_r4, sizeof(state->s_l4)); //copy right to left
++  else if (opts->slot1_on == 1 && opts->slot2_on == 0 && encL == 0) //slot 2 is hard off and slot 1 is on
++    memcpy (state->s_r4, state->s_l4, sizeof(state->s_r4)); //copy left to right
++  else if (opts->slot_preference == 0 && state->dmrburstL == 21 && encL == 0) //slot 1 is preferred, and voice in slot 1
++    memcpy (state->s_r4, state->s_l4, sizeof(state->s_r4)); //copy left to right
++  else if (opts->slot_preference == 1 && state->dmrburstR == 21 && encR == 0) //slot 2 is preferred, and voice in slot 2
++    memcpy (state->s_l4, state->s_r4, sizeof(state->s_l4)); //copy right to left
++  else if (state->dmrburstL == 21 && state->dmrburstR != 21 && encL == 0) //voice in left, no voice in right
++    memcpy (state->s_r4, state->s_l4, sizeof(state->s_r4)); //copy left to right
++  else if (state->dmrburstR == 21 && state->dmrburstL != 21 && encR == 0) //voice in right, no voice in left
++    memcpy (state->s_l4, state->s_r4, sizeof(state->s_l4)); //copy right to left
++  //else if voice in both, and both slots on, and no preference on slot, then regular stereo interleave (left and right channels)
++
++  if (opts->slot1_on == 0 && opts->slot2_on == 0) //both slots are hard off, disable playback
++  {
++    encL = 1;
++    encR = 1;
++  }
+ 
+   //WIP: Mute if on B list (or not W list)
+   char modeL[8];
+@@ -1130,12 +1201,37 @@ void playSynthesizedVoiceSS4 (dsd_opts * opts, dsd_state * state)
+   if (strcmp(modeL, "B") == 0) encL = 1;
+   if (strcmp(modeR, "B") == 0) encR = 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)
++  if (strcmp(modeL, "A") == 0)
++  {
++    opts->slot1_on = 1;
++    opts->slot_preference = 0;
++  }
++  if (strcmp(modeR, "A") == 0)
++  {
++    opts->slot2_on = 1;
++    opts->slot_preference = 1;
++  }
++
+   //if TG Hold in place, mute anything but that TG #132
+-  if (state->tg_hold != 0 && state->tg_hold != TGL) encL = 1;
+-  if (state->tg_hold != 0 && state->tg_hold != TGR) encR = 1;
+-  //likewise, override and unmute if TG hold matches TG
+-  if (state->tg_hold != 0 && state->tg_hold == TGL) encL = 0;
+-  if (state->tg_hold != 0 && state->tg_hold == TGR) encR = 0;
++  if (state->tg_hold != 0 && state->tg_hold != TGL) 
++    encL = 1;
++  if (state->tg_hold != 0 && state->tg_hold != TGR)
++    encR = 1;
++  //likewise, override and unmute if TG hold matches TG (and turn on slot and set preference)
++  if (state->tg_hold != 0 && state->tg_hold == TGL)
++  {
++    encL = 0;
++    opts->slot1_on = 1;
++    opts->slot_preference = 0;
++  }
++  if (state->tg_hold != 0 && state->tg_hold == TGR)
++  {
++    encR = 0;
++    opts->slot2_on = 1;
++    opts->slot_preference = 1;
++  }
+ 
+   //interleave left and right channels from the short storage area
+   for (i = 0; i < 160; i++)
+@@ -1238,6 +1334,226 @@ void playSynthesizedVoiceSS4 (dsd_opts * opts, dsd_state * state)
+ 
+ }
+ 
++//short stereo mix 18v superframe
++void playSynthesizedVoiceSS18 (dsd_opts * opts, dsd_state * state)
++{
++
++  //NOTE: This will run once every superframe during a sacch field
++  //exact implementation to be determined
++
++  int i, j;
++  uint8_t encL, encR;
++
++  short stereo_sf[18][320]; //8k 2-channel stereo interleave mix for full superframe
++  // memset (stereo_sf, 1, 18*sizeof(short)); //I don't think 18*sizeof(short) was large enough, should probably be 18*320*sizeof(short)
++  memset (stereo_sf, 1, sizeof(stereo_sf));
++
++  short empty[320];
++  memset (empty, 1, sizeof(empty));
++
++  //p25p2 enc checkdown for whether or not to fill the stereo sample or not for playback or writing
++  encL = encR = 1;
++  if (state->payload_algid == 0 || state->payload_algid == 0x80)
++    encL = 0;
++  if (state->payload_algidR == 0 || state->payload_algidR == 0x80)
++    encR = 0;
++
++  //checkdown to see if we can lift the 'mute' if a key is available
++  if (encL)
++  {
++    if (state->payload_algid == 0xAA)
++    {
++      if (state->R != 0)
++      {
++        encL = 0;
++      }
++    }
++  }
++
++  if (encR)
++  {
++    if (state->payload_algidR == 0xAA)
++    {
++      if (state->RR != 0)
++      {
++        encR = 0;
++      }
++    }
++  }
++
++
++  //TODO: add option to bypass enc with a toggle as well
++
++  //CHEAT: Using the slot on/off, use that to set encL or encR back on
++  //as a simple way to turn off voice synthesis in a particular slot
++  //its not really 'disabled', we just aren't playing it
++  // if (opts->slot1_on == 0) encL = 1;
++  // if (opts->slot2_on == 0) encR = 1;
++
++  //this may have some unintended side effects that I haven't tested/explored yet, that's why its a patch only
++  //particularly in regards to 'Aero' Builds with their OSS Jank and slot_preference = 3 by default
++  //if rounds of testing in various scenaries looks good, I may expand this to P25p2 and the Float Variants as well
++  if (opts->slot1_on == 0 && opts->slot2_on == 1 && encR == 0) //slot 1 is hard off and slot 2 is on
++    memcpy (state->s_l4, state->s_r4, sizeof(state->s_l4)); //copy right to left
++  else if (opts->slot1_on == 1 && opts->slot2_on == 0 && encL == 0) //slot 2 is hard off and slot 1 is on
++    memcpy (state->s_r4, state->s_l4, sizeof(state->s_r4)); //copy left to right
++  else if (opts->slot_preference == 0 && state->dmrburstL == 21 && encL == 0) //slot 1 is preferred, and voice in slot 1
++    memcpy (state->s_r4, state->s_l4, sizeof(state->s_r4)); //copy left to right
++  else if (opts->slot_preference == 1 && state->dmrburstR == 21 && encR == 0) //slot 2 is preferred, and voice in slot 2
++    memcpy (state->s_l4, state->s_r4, sizeof(state->s_l4)); //copy right to left
++  else if (state->dmrburstL == 21 && state->dmrburstR != 21 && encL == 0) //voice in left, no voice in right
++    memcpy (state->s_r4, state->s_l4, sizeof(state->s_r4)); //copy left to right
++  else if (state->dmrburstR == 21 && state->dmrburstL != 21 && encR == 0) //voice in right, no voice in left
++    memcpy (state->s_l4, state->s_r4, sizeof(state->s_l4)); //copy right to left
++  //else if voice in both, and both slots on, and no preference on slot, then regular stereo interleave (left and right channels)
++
++  if (opts->slot1_on == 0 && opts->slot2_on == 0) //both slots are hard off, disable playback
++  {
++    encL = 1;
++    encR = 1;
++  }
++
++  //WIP: Mute if on B list (or not W list)
++  char modeL[8];
++  sprintf (modeL, "%s", "");
++  char modeR[8];
++  sprintf (modeR, "%s", "");
++
++  int TGL = state->lasttg;
++  int TGR = state->lasttgR;
++
++  //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
++  if (opts->trunk_use_allow_list == 1)
++  {
++    sprintf (modeL, "%s", "B");
++    sprintf (modeR, "%s", "B");
++  }
++
++  for (i = 0; i < state->group_tally; i++)
++  {
++    if (state->group_array[i].groupNumber == TGL)
++    {
++      strcpy (modeL, state->group_array[i].groupMode);
++      // break; //need to keep going to check other potential slot group
++    }
++    if (state->group_array[i].groupNumber == TGR)
++    {
++      strcpy (modeR, state->group_array[i].groupMode);
++      // break; //need to keep going to check other potential slot group
++    }
++  }
++
++  //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;
++
++  //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)
++  if (strcmp(modeL, "A") == 0)
++  {
++    opts->slot1_on = 1;
++    opts->slot_preference = 0;
++  }
++  if (strcmp(modeR, "A") == 0)
++  {
++    opts->slot2_on = 1;
++    opts->slot_preference = 1;
++  }
++
++  //if TG Hold in place, mute anything but that TG #132
++  if (state->tg_hold != 0 && state->tg_hold != TGL) 
++    encL = 1;
++  if (state->tg_hold != 0 && state->tg_hold != TGR)
++    encR = 1;
++  //likewise, override and unmute if TG hold matches TG (and turn on slot and set preference)
++  if (state->tg_hold != 0 && state->tg_hold == TGL)
++  {
++    encL = 0;
++    opts->slot1_on = 1;
++    opts->slot_preference = 0;
++  }
++  if (state->tg_hold != 0 && state->tg_hold == TGR)
++  {
++    encR = 0;
++    opts->slot2_on = 1;
++    opts->slot_preference = 1;
++  }
++
++  //at this point, if both channels are still flagged as enc, then we can skip all playback/writing functions
++  if (encL && encR)
++    goto SS18_END;
++
++  //interleave left and right channels from the short storage area
++  for (j = 0; j < 18; j++)
++  {
++    for (i = 0; i < 160; i++)
++    {
++      if (!encL)
++        stereo_sf[j][i*2+0] = state->s_l4[j][i];
++      if (!encR)
++        stereo_sf[j][i*2+1] = state->s_r4[j][i];
++    }
++  }
++
++  if (opts->audio_out_type == 0) //Pulse Audio
++  {
++    for (j = 0; j < 18; j++)
++    {
++      if (memcmp(empty, stereo_sf[j], sizeof(empty)) != 0) //may not work as intended because its stereo and one will have something in it most likely
++        pa_simple_write(opts->pulse_digi_dev_out, stereo_sf[j], 320*2, NULL);
++    }
++  }
++
++  if (opts->audio_out_type == 8) //UDP Audio
++  {
++    for (j = 0; j < 18; j++)
++    {
++      if (memcmp(empty, stereo_sf[j], sizeof(empty)) != 0) //may not work as intended because its stereo and one will have something in it most likely
++        udp_socket_blaster (opts, state, 320*2, stereo_sf[j]);
++    }
++  }
++  
++
++  if (opts->audio_out_type == 1 || opts->audio_out_type == 2) //STDOUT or OSS 8k/2channel
++  {
++    for (j = 0; j < 18; j++)
++    {
++      if (memcmp(empty, stereo_sf[j], sizeof(empty)) != 0) //may not work as intended because its stereo and one will have something in it most likely
++        write (opts->audio_out_fd, stereo_sf[j], 320*2);
++    }
++  }
++
++  SS18_END:
++
++  //run cleanup since we pulled stuff from processAudio
++  state->audio_out_idx = 0;
++  state->audio_out_idxR = 0;
++
++  //set float temp buffer to baseline
++  memset (state->s_l4, 1, sizeof(state->s_l4));
++  memset (state->s_r4, 1, sizeof(state->s_r4));
++
++  if (state->audio_out_idx2 >= 800000)
++  {
++    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;
++  }
++
++  if (state->audio_out_idx2R >= 800000)
++  {
++    state->audio_out_float_buf_pR = state->audio_out_float_bufR + 100;
++    state->audio_out_buf_pR = state->audio_out_bufR + 100;
++    memset (state->audio_out_float_bufR, 0, 100 * sizeof (float));
++    memset (state->audio_out_bufR, 0, 100 * sizeof (short));
++    state->audio_out_idx2R = 0;
++  }
++
++}
++
+ //largely borrowed from Boatbod OP25 (simplified single tone ID version)
+ void soft_tonef (float samp[160], int n, int ID, int AD)
+ {
+diff --git a/src/dsd_main.c b/src/dsd_main.c
+index 1d2616b..02590a6 100644
+--- a/src/dsd_main.c
++++ b/src/dsd_main.c
+@@ -382,6 +382,8 @@ if(opts->frame_m17 == 1) //&& opts->audio_in_type == 5
+   }
+   state->fourv_counter[0] = 0;
+   state->fourv_counter[1] = 0;
++  state->voice_counter[0] = 0;
++  state->voice_counter[1] = 0;
+ 
+   //values displayed in ncurses terminal
+   // state->p25_vc_freq[0] = 0;
+@@ -745,7 +747,7 @@ initOpts (dsd_opts * opts)
+   //slot preference is used during OSS audio playback to
+   //prefer one tdma voice slot over another when both are playing back
+   //this is a fix to OSS 48k/1 output
+-  opts->slot_preference = 0; //default prefer slot 1 -- state->currentslot = 0;
++  opts->slot_preference = 2; //default prefer slot 1 -- state->currentslot = 0;
+ 
+   //hardset slots to synthesize
+   opts->slot1_on = 1;
+@@ -941,6 +943,8 @@ initState (dsd_state * state)
+   }
+   state->fourv_counter[0] = 0;
+   state->fourv_counter[1] = 0;
++  state->voice_counter[0] = 0;
++  state->voice_counter[1] = 0;
+ 
+   state->K = 0;
+   state->R = 0;
+diff --git a/src/dsd_ncurses.c b/src/dsd_ncurses.c
+index 4646e77..fc3f28b 100644
+--- a/src/dsd_ncurses.c
++++ b/src/dsd_ncurses.c
+@@ -2568,11 +2568,11 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
+   {
+     printw ("| Voice Error: [%i][%i] Slot 1 (1)", state->errs, state->errs2);
+     if (opts->slot1_on == 0) printw (" OFF");
+-    if (opts->slot1_on == 1) printw (" ON");
++    if (opts->slot1_on == 1) printw (" ON"); if (opts->slot_preference == 0) printw (" *Preferred");
+     printw ("\n");
+     printw ("| Voice Error: [%i][%i] Slot 2 (2)", state->errsR, state->errs2R);
+     if (opts->slot2_on == 0) printw (" OFF");
+-    if (opts->slot2_on == 1) printw (" ON");
++    if (opts->slot2_on == 1) printw (" ON"); if (opts->slot_preference == 1) printw (" *Preferred");
+     printw ("\n");
+   }
+   printw ("------------------------------------------------------------------------------\n");
+@@ -3654,8 +3654,8 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
+     //switching, but want to control each seperately plz
+     if (opts->slot1_on == 1)
+     {
+-      opts->slot1_on = 0;
+-      opts->slot_preference = 1; //slot 2
++      opts->slot1_on = 0; if (opts->slot_preference == 0) opts->slot_preference = 2;
++      // opts->slot_preference = 1; //slot 2
+       //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;
+@@ -3680,8 +3680,8 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
+     //switching, but want to control each seperately plz
+     if (opts->slot2_on == 1)
+     {
+-      opts->slot2_on = 0;
+-      opts->slot_preference = 0; //slot 1
++      opts->slot2_on = 0; if (opts->slot_preference == 1) opts->slot_preference = 2; 
++      // opts->slot_preference = 0; //slot 1
+       //clear any previously buffered audio
+       state->audio_out_float_buf_pR = state->audio_out_float_bufR + 100;
+       state->audio_out_buf_pR = state->audio_out_bufR + 100;
+@@ -3701,6 +3701,13 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
+     }
+   }
+ 
++  if (c == 51) //'3' key, cycle slot preferences
++  {
++    if (opts->slot_preference < 2)
++      opts->slot_preference++;
++    else opts->slot_preference = 0; 
++  }
++
+   if (c == 43) //+ key, increment audio_gain
+   {
+ 
+diff --git a/src/p25p2_frame.c b/src/p25p2_frame.c
+index c391eba..99a4840 100644
+--- a/src/p25p2_frame.c
++++ b/src/p25p2_frame.c
+@@ -490,18 +490,27 @@ void process_4V (dsd_opts * opts, dsd_state * state)
+ 	// 	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;
+ 	
+ 	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[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[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));
+ 	}
+ 
+@@ -509,13 +518,15 @@ void process_4V (dsd_opts * opts, dsd_state * state)
+ 	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[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[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));
+ 	}
+ 
+@@ -523,13 +534,15 @@ void process_4V (dsd_opts * opts, dsd_state * state)
+ 	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[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[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));
+ 	}
+ 
+@@ -537,13 +550,15 @@ void process_4V (dsd_opts * opts, dsd_state * state)
+ 	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[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[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));
+ 	}
+ 
+@@ -709,17 +724,26 @@ void process_2V (dsd_opts * opts, dsd_state * state)
+ 	// }
+ 	// #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;
++
+ 	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[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[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));
+ 	}
+ 
+@@ -727,17 +751,19 @@ void process_2V (dsd_opts * opts, dsd_state * state)
+ 	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[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[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
+@@ -930,6 +956,8 @@ 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;
+ 		}
+@@ -949,8 +977,32 @@ void process_P2_DUID (dsd_opts * opts, dsd_state * state)
+ 		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);
++		// 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
++		{
++			playSynthesizedVoiceSS18 (opts, state);
++			state->voice_counter[0] = 0; //reset
++			state->voice_counter[1] = 0; //reset
++		}
++
++		//these two will work, but NOT at the same time on dual voice
++		// if (state->voice_counter[0] >= 18 && opts->floating_point == 0 && opts->pulse_digi_rate_out == 8000) //&& ts_counter & 1
++		// {
++		// 	playSynthesizedVoiceSS18 (opts, state);
++		// 	state->voice_counter[0] = 0; //reset
++		// }
++
++		// if (state->voice_counter[1] >= 18 && opts->floating_point == 0 && opts->pulse_digi_rate_out == 8000) //&& ts_counter & 1
++		// {
++		// 	playSynthesizedVoiceSS18 (opts, state);
++		// 	state->voice_counter[1] = 0; //reset
++		// }
+ 
+ 		//debug: fix burst indicator for ncurses if marginal signal
+ 		// if (voice)
+diff --git a/src/p25p2_xcch.c b/src/p25p2_xcch.c
+index 101d1e4..847fe71 100644
+--- a/src/p25p2_xcch.c
++++ b/src/p25p2_xcch.c
+@@ -122,6 +122,7 @@ 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;
+@@ -171,6 +172,7 @@ void process_SACCH_MAC_PDU (dsd_opts * opts, dsd_state * state, int payload[180]
+ 		{
+ 			//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
+ 
+@@ -230,6 +232,7 @@ 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; 
+@@ -258,6 +261,7 @@ void process_SACCH_MAC_PDU (dsd_opts * opts, dsd_state * state, int payload[180]
+ 		{
+ 			
+ 			state->fourv_counter[1] = 0;
++			state->voice_counter[1] = 0;
+ 			state->dropR = 256;
+ 			state->dmrburstR = 23;
+ 			state->payload_algidR = 0;
+@@ -498,6 +502,7 @@ 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;
+@@ -538,6 +543,7 @@ void process_FACCH_MAC_PDU (dsd_opts * opts, dsd_state * state, int payload[156]
+ 		{
+ 			//reset fourv_counter and dropbyte on PTT
+ 			state->fourv_counter[1] = 0;
++			state->voice_counter[1] = 0;
+ 			state->dropR = 256;
+ 
+ 			state->dmrburstR = 20;
+@@ -594,6 +600,7 @@ 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
+@@ -622,6 +629,7 @@ void process_FACCH_MAC_PDU (dsd_opts * opts, dsd_state * state, int payload[156]
+ 		{
+ 			
+ 			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
+@@ -723,6 +731,7 @@ 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;
+ 
+@@ -733,6 +742,7 @@ 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;
+ 

patch/wolf_tdma_mono_stereo.patch

@@ -0,0 +1,452 @@
+diff --git a/src/dsd_audio2.c b/src/dsd_audio2.c
+index a836afc..5eaf3c4 100644
+--- a/src/dsd_audio2.c
++++ b/src/dsd_audio2.c
+@@ -906,8 +906,31 @@ void playSynthesizedVoiceSS3 (dsd_opts * opts, dsd_state * state)
+   //CHEAT: Using the slot on/off, use that to set encL or encR back on
+   //as a simple way to turn off voice synthesis in a particular slot
+   //its not really 'disabled', we just aren't playing it
+-  if (opts->slot1_on == 0) encL = 1;
+-  if (opts->slot2_on == 0) encR = 1;
++  // if (opts->slot1_on == 0) encL = 1;
++  // if (opts->slot2_on == 0) encR = 1;
++
++  //this may have some unintended side effects that I haven't tested/explored yet, that's why its a patch only
++  //particularly in regards to 'Aero' Builds with their OSS Jank and slot_preference = 3 by default
++  //if rounds of testing in various scenaries looks good, I may expand this to P25p2 and the Float Variants as well
++  if (opts->slot1_on == 0 && opts->slot2_on == 1 && encR == 0) //slot 1 is hard off and slot 2 is on
++    memcpy (state->s_l4, state->s_r4, sizeof(state->s_l4)); //copy right to left
++  else if (opts->slot1_on == 1 && opts->slot2_on == 0 && encL == 0) //slot 2 is hard off and slot 1 is on
++    memcpy (state->s_r4, state->s_l4, sizeof(state->s_r4)); //copy left to right
++  else if (opts->slot_preference == 0 && state->dmrburstL == 16 && encL == 0) //slot 1 is preferred, and voice in slot 1
++    memcpy (state->s_r4, state->s_l4, sizeof(state->s_r4)); //copy left to right
++  else if (opts->slot_preference == 1 && state->dmrburstR == 16 && encR == 0) //slot 2 is preferred, and voice in slot 2
++    memcpy (state->s_l4, state->s_r4, sizeof(state->s_l4)); //copy right to left
++  else if (state->dmrburstL == 16 && state->dmrburstR != 16 && encL == 0) //voice in left, no voice in right
++    memcpy (state->s_r4, state->s_l4, sizeof(state->s_r4)); //copy left to right
++  else if (state->dmrburstR == 16 && state->dmrburstL != 16 && encR == 0) //voice in right, no voice in left
++    memcpy (state->s_l4, state->s_r4, sizeof(state->s_l4)); //copy right to left
++  //else if voice in both, and both slots on, and no preference on slot, then regular stereo interleave (left and right channels)
++
++  if (opts->slot1_on == 0 && opts->slot2_on == 0) //both slots are hard off, disable playback
++  {
++    encL = 1;
++    encR = 1;
++  }
+ 
+   //WIP: Mute if on B list (or not W list)
+   char modeL[8];
+@@ -944,12 +967,37 @@ void playSynthesizedVoiceSS3 (dsd_opts * opts, dsd_state * state)
+   if (strcmp(modeL, "B") == 0) encL = 1;
+   if (strcmp(modeR, "B") == 0) encR = 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)
++  if (strcmp(modeL, "A") == 0)
++  {
++    opts->slot1_on = 1;
++    opts->slot_preference = 0;
++  }
++  if (strcmp(modeR, "A") == 0)
++  {
++    opts->slot2_on = 1;
++    opts->slot_preference = 1;
++  }
++
+   //if TG Hold in place, mute anything but that TG #132
+-  if (state->tg_hold != 0 && state->tg_hold != TGL) encL = 1;
+-  if (state->tg_hold != 0 && state->tg_hold != TGR) encR = 1;
+-  //likewise, override and unmute if TG hold matches TG
+-  if (state->tg_hold != 0 && state->tg_hold == TGL) encL = 0;
+-  if (state->tg_hold != 0 && state->tg_hold == TGR) encR = 0;
++  if (state->tg_hold != 0 && state->tg_hold != TGL) 
++    encL = 1;
++  if (state->tg_hold != 0 && state->tg_hold != TGR)
++    encR = 1;
++  //likewise, override and unmute if TG hold matches TG (and turn on slot and set preference)
++  if (state->tg_hold != 0 && state->tg_hold == TGL)
++  {
++    encL = 0;
++    opts->slot1_on = 1;
++    opts->slot_preference = 0;
++  }
++  if (state->tg_hold != 0 && state->tg_hold == TGR)
++  {
++    encR = 0;
++    opts->slot2_on = 1;
++    opts->slot_preference = 1;
++  }
+ 
+   //interleave left and right channels from the short storage area
+   for (i = 0; i < 160; i++)
+@@ -1092,8 +1140,31 @@ void playSynthesizedVoiceSS4 (dsd_opts * opts, dsd_state * state)
+   //CHEAT: Using the slot on/off, use that to set encL or encR back on
+   //as a simple way to turn off voice synthesis in a particular slot
+   //its not really 'disabled', we just aren't playing it
+-  if (opts->slot1_on == 0) encL = 1;
+-  if (opts->slot2_on == 0) encR = 1;
++  // if (opts->slot1_on == 0) encL = 1;
++  // if (opts->slot2_on == 0) encR = 1;
++
++  //this may have some unintended side effects that I haven't tested/explored yet, that's why its a patch only
++  //particularly in regards to 'Aero' Builds with their OSS Jank and slot_preference = 3 by default
++  //if rounds of testing in various scenaries looks good, I may expand this to P25p2 and the Float Variants as well
++  if (opts->slot1_on == 0 && opts->slot2_on == 1 && encR == 0) //slot 1 is hard off and slot 2 is on
++    memcpy (state->s_l4, state->s_r4, sizeof(state->s_l4)); //copy right to left
++  else if (opts->slot1_on == 1 && opts->slot2_on == 0 && encL == 0) //slot 2 is hard off and slot 1 is on
++    memcpy (state->s_r4, state->s_l4, sizeof(state->s_r4)); //copy left to right
++  else if (opts->slot_preference == 0 && state->dmrburstL == 21 && encL == 0) //slot 1 is preferred, and voice in slot 1
++    memcpy (state->s_r4, state->s_l4, sizeof(state->s_r4)); //copy left to right
++  else if (opts->slot_preference == 1 && state->dmrburstR == 21 && encR == 0) //slot 2 is preferred, and voice in slot 2
++    memcpy (state->s_l4, state->s_r4, sizeof(state->s_l4)); //copy right to left
++  else if (state->dmrburstL == 21 && state->dmrburstR != 21 && encL == 0) //voice in left, no voice in right
++    memcpy (state->s_r4, state->s_l4, sizeof(state->s_r4)); //copy left to right
++  else if (state->dmrburstR == 21 && state->dmrburstL != 21 && encR == 0) //voice in right, no voice in left
++    memcpy (state->s_l4, state->s_r4, sizeof(state->s_l4)); //copy right to left
++  //else if voice in both, and both slots on, and no preference on slot, then regular stereo interleave (left and right channels)
++
++  if (opts->slot1_on == 0 && opts->slot2_on == 0) //both slots are hard off, disable playback
++  {
++    encL = 1;
++    encR = 1;
++  }
+ 
+   //WIP: Mute if on B list (or not W list)
+   char modeL[8];
+@@ -1130,12 +1201,37 @@ void playSynthesizedVoiceSS4 (dsd_opts * opts, dsd_state * state)
+   if (strcmp(modeL, "B") == 0) encL = 1;
+   if (strcmp(modeR, "B") == 0) encR = 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)
++  if (strcmp(modeL, "A") == 0)
++  {
++    opts->slot1_on = 1;
++    opts->slot_preference = 0;
++  }
++  if (strcmp(modeR, "A") == 0)
++  {
++    opts->slot2_on = 1;
++    opts->slot_preference = 1;
++  }
++
+   //if TG Hold in place, mute anything but that TG #132
+-  if (state->tg_hold != 0 && state->tg_hold != TGL) encL = 1;
+-  if (state->tg_hold != 0 && state->tg_hold != TGR) encR = 1;
+-  //likewise, override and unmute if TG hold matches TG
+-  if (state->tg_hold != 0 && state->tg_hold == TGL) encL = 0;
+-  if (state->tg_hold != 0 && state->tg_hold == TGR) encR = 0;
++  if (state->tg_hold != 0 && state->tg_hold != TGL) 
++    encL = 1;
++  if (state->tg_hold != 0 && state->tg_hold != TGR)
++    encR = 1;
++  //likewise, override and unmute if TG hold matches TG (and turn on slot and set preference)
++  if (state->tg_hold != 0 && state->tg_hold == TGL)
++  {
++    encL = 0;
++    opts->slot1_on = 1;
++    opts->slot_preference = 0;
++  }
++  if (state->tg_hold != 0 && state->tg_hold == TGR)
++  {
++    encR = 0;
++    opts->slot2_on = 1;
++    opts->slot_preference = 1;
++  }
+ 
+   //interleave left and right channels from the short storage area
+   for (i = 0; i < 160; i++)
+@@ -1238,6 +1334,226 @@ void playSynthesizedVoiceSS4 (dsd_opts * opts, dsd_state * state)
+ 
+ }
+ 
++//short stereo mix 18v superframe
++void playSynthesizedVoiceSS18 (dsd_opts * opts, dsd_state * state)
++{
++
++  //NOTE: This will run once every superframe during a sacch field
++  //exact implementation to be determined
++
++  int i, j;
++  uint8_t encL, encR;
++
++  short stereo_sf[18][320]; //8k 2-channel stereo interleave mix for full superframe
++  // memset (stereo_sf, 1, 18*sizeof(short)); //I don't think 18*sizeof(short) was large enough, should probably be 18*320*sizeof(short)
++  memset (stereo_sf, 1, sizeof(stereo_sf));
++
++  short empty[320];
++  memset (empty, 1, sizeof(empty));
++
++  //p25p2 enc checkdown for whether or not to fill the stereo sample or not for playback or writing
++  encL = encR = 1;
++  if (state->payload_algid == 0 || state->payload_algid == 0x80)
++    encL = 0;
++  if (state->payload_algidR == 0 || state->payload_algidR == 0x80)
++    encR = 0;
++
++  //checkdown to see if we can lift the 'mute' if a key is available
++  if (encL)
++  {
++    if (state->payload_algid == 0xAA)
++    {
++      if (state->R != 0)
++      {
++        encL = 0;
++      }
++    }
++  }
++
++  if (encR)
++  {
++    if (state->payload_algidR == 0xAA)
++    {
++      if (state->RR != 0)
++      {
++        encR = 0;
++      }
++    }
++  }
++
++
++  //TODO: add option to bypass enc with a toggle as well
++
++  //CHEAT: Using the slot on/off, use that to set encL or encR back on
++  //as a simple way to turn off voice synthesis in a particular slot
++  //its not really 'disabled', we just aren't playing it
++  // if (opts->slot1_on == 0) encL = 1;
++  // if (opts->slot2_on == 0) encR = 1;
++
++  //this may have some unintended side effects that I haven't tested/explored yet, that's why its a patch only
++  //particularly in regards to 'Aero' Builds with their OSS Jank and slot_preference = 3 by default
++  //if rounds of testing in various scenaries looks good, I may expand this to P25p2 and the Float Variants as well
++  if (opts->slot1_on == 0 && opts->slot2_on == 1 && encR == 0) //slot 1 is hard off and slot 2 is on
++    memcpy (state->s_l4, state->s_r4, sizeof(state->s_l4)); //copy right to left
++  else if (opts->slot1_on == 1 && opts->slot2_on == 0 && encL == 0) //slot 2 is hard off and slot 1 is on
++    memcpy (state->s_r4, state->s_l4, sizeof(state->s_r4)); //copy left to right
++  else if (opts->slot_preference == 0 && state->dmrburstL == 21 && encL == 0) //slot 1 is preferred, and voice in slot 1
++    memcpy (state->s_r4, state->s_l4, sizeof(state->s_r4)); //copy left to right
++  else if (opts->slot_preference == 1 && state->dmrburstR == 21 && encR == 0) //slot 2 is preferred, and voice in slot 2
++    memcpy (state->s_l4, state->s_r4, sizeof(state->s_l4)); //copy right to left
++  else if (state->dmrburstL == 21 && state->dmrburstR != 21 && encL == 0) //voice in left, no voice in right
++    memcpy (state->s_r4, state->s_l4, sizeof(state->s_r4)); //copy left to right
++  else if (state->dmrburstR == 21 && state->dmrburstL != 21 && encR == 0) //voice in right, no voice in left
++    memcpy (state->s_l4, state->s_r4, sizeof(state->s_l4)); //copy right to left
++  //else if voice in both, and both slots on, and no preference on slot, then regular stereo interleave (left and right channels)
++
++  if (opts->slot1_on == 0 && opts->slot2_on == 0) //both slots are hard off, disable playback
++  {
++    encL = 1;
++    encR = 1;
++  }
++
++  //WIP: Mute if on B list (or not W list)
++  char modeL[8];
++  sprintf (modeL, "%s", "");
++  char modeR[8];
++  sprintf (modeR, "%s", "");
++
++  int TGL = state->lasttg;
++  int TGR = state->lasttgR;
++
++  //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
++  if (opts->trunk_use_allow_list == 1)
++  {
++    sprintf (modeL, "%s", "B");
++    sprintf (modeR, "%s", "B");
++  }
++
++  for (i = 0; i < state->group_tally; i++)
++  {
++    if (state->group_array[i].groupNumber == TGL)
++    {
++      strcpy (modeL, state->group_array[i].groupMode);
++      // break; //need to keep going to check other potential slot group
++    }
++    if (state->group_array[i].groupNumber == TGR)
++    {
++      strcpy (modeR, state->group_array[i].groupMode);
++      // break; //need to keep going to check other potential slot group
++    }
++  }
++
++  //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;
++
++  //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)
++  if (strcmp(modeL, "A") == 0)
++  {
++    opts->slot1_on = 1;
++    opts->slot_preference = 0;
++  }
++  if (strcmp(modeR, "A") == 0)
++  {
++    opts->slot2_on = 1;
++    opts->slot_preference = 1;
++  }
++
++  //if TG Hold in place, mute anything but that TG #132
++  if (state->tg_hold != 0 && state->tg_hold != TGL) 
++    encL = 1;
++  if (state->tg_hold != 0 && state->tg_hold != TGR)
++    encR = 1;
++  //likewise, override and unmute if TG hold matches TG (and turn on slot and set preference)
++  if (state->tg_hold != 0 && state->tg_hold == TGL)
++  {
++    encL = 0;
++    opts->slot1_on = 1;
++    opts->slot_preference = 0;
++  }
++  if (state->tg_hold != 0 && state->tg_hold == TGR)
++  {
++    encR = 0;
++    opts->slot2_on = 1;
++    opts->slot_preference = 1;
++  }
++
++  //at this point, if both channels are still flagged as enc, then we can skip all playback/writing functions
++  if (encL && encR)
++    goto SS18_END;
++
++  //interleave left and right channels from the short storage area
++  for (j = 0; j < 18; j++)
++  {
++    for (i = 0; i < 160; i++)
++    {
++      if (!encL)
++        stereo_sf[j][i*2+0] = state->s_l4[j][i];
++      if (!encR)
++        stereo_sf[j][i*2+1] = state->s_r4[j][i];
++    }
++  }
++
++  if (opts->audio_out_type == 0) //Pulse Audio
++  {
++    for (j = 0; j < 18; j++)
++    {
++      if (memcmp(empty, stereo_sf[j], sizeof(empty)) != 0) //may not work as intended because its stereo and one will have something in it most likely
++        pa_simple_write(opts->pulse_digi_dev_out, stereo_sf[j], 320*2, NULL);
++    }
++  }
++
++  if (opts->audio_out_type == 8) //UDP Audio
++  {
++    for (j = 0; j < 18; j++)
++    {
++      if (memcmp(empty, stereo_sf[j], sizeof(empty)) != 0) //may not work as intended because its stereo and one will have something in it most likely
++        udp_socket_blaster (opts, state, 320*2, stereo_sf[j]);
++    }
++  }
++  
++
++  if (opts->audio_out_type == 1 || opts->audio_out_type == 2) //STDOUT or OSS 8k/2channel
++  {
++    for (j = 0; j < 18; j++)
++    {
++      if (memcmp(empty, stereo_sf[j], sizeof(empty)) != 0) //may not work as intended because its stereo and one will have something in it most likely
++        write (opts->audio_out_fd, stereo_sf[j], 320*2);
++    }
++  }
++
++  SS18_END:
++
++  //run cleanup since we pulled stuff from processAudio
++  state->audio_out_idx = 0;
++  state->audio_out_idxR = 0;
++
++  //set float temp buffer to baseline
++  memset (state->s_l4, 1, sizeof(state->s_l4));
++  memset (state->s_r4, 1, sizeof(state->s_r4));
++
++  if (state->audio_out_idx2 >= 800000)
++  {
++    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;
++  }
++
++  if (state->audio_out_idx2R >= 800000)
++  {
++    state->audio_out_float_buf_pR = state->audio_out_float_bufR + 100;
++    state->audio_out_buf_pR = state->audio_out_bufR + 100;
++    memset (state->audio_out_float_bufR, 0, 100 * sizeof (float));
++    memset (state->audio_out_bufR, 0, 100 * sizeof (short));
++    state->audio_out_idx2R = 0;
++  }
++
++}
++
+ //largely borrowed from Boatbod OP25 (simplified single tone ID version)
+ void soft_tonef (float samp[160], int n, int ID, int AD)
+ {
+diff --git a/src/dsd_main.c b/src/dsd_main.c
+index 1d2616b..924bf00 100644
+--- a/src/dsd_main.c
++++ b/src/dsd_main.c
+@@ -745,7 +745,7 @@ initOpts (dsd_opts * opts)
+   //slot preference is used during OSS audio playback to
+   //prefer one tdma voice slot over another when both are playing back
+   //this is a fix to OSS 48k/1 output
+-  opts->slot_preference = 0; //default prefer slot 1 -- state->currentslot = 0;
++  opts->slot_preference = 2; //default prefer slot 1 -- state->currentslot = 0;
+ 
+   //hardset slots to synthesize
+   opts->slot1_on = 1;
+diff --git a/src/dsd_ncurses.c b/src/dsd_ncurses.c
+index 4646e77..fc3f28b 100644
+--- a/src/dsd_ncurses.c
++++ b/src/dsd_ncurses.c
+@@ -2568,11 +2568,11 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
+   {
+     printw ("| Voice Error: [%i][%i] Slot 1 (1)", state->errs, state->errs2);
+     if (opts->slot1_on == 0) printw (" OFF");
+-    if (opts->slot1_on == 1) printw (" ON");
++    if (opts->slot1_on == 1) printw (" ON"); if (opts->slot_preference == 0) printw (" *Preferred");
+     printw ("\n");
+     printw ("| Voice Error: [%i][%i] Slot 2 (2)", state->errsR, state->errs2R);
+     if (opts->slot2_on == 0) printw (" OFF");
+-    if (opts->slot2_on == 1) printw (" ON");
++    if (opts->slot2_on == 1) printw (" ON"); if (opts->slot_preference == 1) printw (" *Preferred");
+     printw ("\n");
+   }
+   printw ("------------------------------------------------------------------------------\n");
+@@ -3654,8 +3654,8 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
+     //switching, but want to control each seperately plz
+     if (opts->slot1_on == 1)
+     {
+-      opts->slot1_on = 0;
+-      opts->slot_preference = 1; //slot 2
++      opts->slot1_on = 0; if (opts->slot_preference == 0) opts->slot_preference = 2;
++      // opts->slot_preference = 1; //slot 2
+       //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;
+@@ -3680,8 +3680,8 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
+     //switching, but want to control each seperately plz
+     if (opts->slot2_on == 1)
+     {
+-      opts->slot2_on = 0;
+-      opts->slot_preference = 0; //slot 1
++      opts->slot2_on = 0; if (opts->slot_preference == 1) opts->slot_preference = 2; 
++      // opts->slot_preference = 0; //slot 1
+       //clear any previously buffered audio
+       state->audio_out_float_buf_pR = state->audio_out_float_bufR + 100;
+       state->audio_out_buf_pR = state->audio_out_bufR + 100;
+@@ -3701,6 +3701,13 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
+     }
+   }
+ 
++  if (c == 51) //'3' key, cycle slot preferences
++  {
++    if (opts->slot_preference < 2)
++      opts->slot_preference++;
++    else opts->slot_preference = 0; 
++  }
++
+   if (c == 43) //+ key, increment audio_gain
+   {
+ 

rebuild.sh

@@ -1,21 +1,15 @@
 #! /bin/bash
+#
 clear
-echo DSD-FME Digital Speech Decoder - Florida Man Edition
+printf "DSD-FME Digital Speech Decoder - Florida Man Edition
-echo Automatic Git Pull and Rebuild
+Automatic Git Pull and Rebuild\n\n"
-echo 
 sleep 1
 ##Open your clone folder##
-git pull https://github.com/lwvmobile/dsd-fme pulseaudio
+git pull
 sleep 2
-sudo cp tone8.wav /usr/share/
-sudo cp tone24.wav /usr/share/
-sudo chmod 777 /usr/share/tone8.wav
-sudo chmod 777 /usr/share/tone24.wav
 ##cd into your build folder##
 cd build
-##cmake usually isn't necesary, but could be if I update the cmakelist.txt
 cmake ..
-make -j `nproc`
+make -j $(nproc)
 sudo make install
-sudo ldconfig
+sudo ldconfig
-

src/1.c

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

src/2.c

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

src/3.c

@@ -0,0 +1,87 @@
+/*-------------------------------------------------------------------------------
+ * 3.c
+ * Placeholder File 3 -- This file is for temporary code storage
+ *
+ * A 1/2 Rate Convolutional Decoder 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.
+ */

src/4.c

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

src/5.c

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

src/bptc.c

@@ -134,6 +134,13 @@ const uint8_t DeInterleaveReverseChannelBptc[32] =
   24,  9, 26, 11, 28, 13, 30, 15
 };
 
+const uint8_t DeInterleaveReverseChannelBptcPlacement[32] =
+{
+   0, 16,  1, 17,  2, 18,  3, 19,
+   4, 20,  5, 21,  6, 22,  7, 23,
+   8, 24,  9, 25, 10, 26, 11, 27,
+  12, 28, 13, 29, 14, 30, 15, 31
+};
 
 /* Functions ----------------------------------------------------------------*/
 
@@ -192,18 +199,10 @@ uint32_t BPTC_196x96_Extract_Data(uint8_t InputDeInteleavedData[196], uint8_t DM
     }
   }
 
-  /* R(0) to R(2) may be used to transport some
-   * Restricted Access System (RAS) information,
-   * So save these three bytes before reset all of them
-   * See patent US 2013/0288643 A1 */
-  R[0] = DataMatrix[0][2]; /* Save R(0) */
-  R[1] = DataMatrix[0][1]; /* Save R(1) */
-  R[2] = DataMatrix[0][0]; /* Save R(2) */
-
   /* Set to 0 R(0) to R(2) - See DMR standard chapter B1.1 BPTC (196,96) */
-  DataMatrix[0][0] = 0; /* R(2) */
+  // DataMatrix[0][0] = 0; /* R(2) */
-  DataMatrix[0][1] = 0; /* R(1) */
+  // DataMatrix[0][1] = 0; /* R(1) */
-  DataMatrix[0][2] = 0; /* R(0) */
+  // DataMatrix[0][2] = 0; /* R(0) */
 
   /* Init the Hamming (15,11,3) library
    * Not needed because it has already been done
@@ -356,6 +355,14 @@ uint32_t BPTC_196x96_Extract_Data(uint8_t InputDeInteleavedData[196], uint8_t DM
     }
   }
 
+  /* R(0) to R(2) may be used to transport some
+   * Restricted Access System (RAS) information,
+   * So save these three bits after hamming correction
+   * See patent US 2013/0288643 A1 */
+  R[0] = DataMatrix[0][2]; /* Save R(0) */
+  R[1] = DataMatrix[0][1]; /* Save R(1) */
+  R[2] = DataMatrix[0][0]; /* Save R(2) */
+
   /* Return the number of irrecoverable Hamming errors */
   return HammingIrrecoverableErrorNb;
 } /* End BPTC_196x96_Extract_Data() */
@@ -498,33 +505,38 @@ uint32_t BPTC_128x77_Extract_Data(uint8_t InputDataMatrix[8][16], uint8_t DMRDat
  *                           DMRDataExtracted[11..15] = Hamming data
  *                           DMRDataExtracted[16..31] = 16 bits of odd parity (to be checked)
  *
+ * @param ParityCheckTypeOdd : 0 = Parity to check is even (used in Non-Reverse Channel Single Burst BPTC)
+ *                             1 = Parity to check is odd (used in Reverse Channel Single Burst BPTC)
+ *
  * @return 0 = All is OK
  *         Other = Error - Irrecoverable Hamming parity check error number
  */
-uint32_t BPTC_16x2_Extract_Data(uint8_t InputInterleavedData[32], uint8_t DMRDataExtracted[32])
+uint32_t BPTC_16x2_Extract_Data(uint8_t InputInterleavedData[32], uint8_t DMRDataExtracted[32], uint32_t ParityCheckTypeOdd)
 {
   uint32_t i;
   uint8_t  DataMatrix[32];
   uint8_t  LineUncorrected[16];
   uint8_t  LineCorrected[11];
   uint32_t HammingIrrecoverableErrorNb = 0;
-  uint32_t ParityCheckErrorNb = 0;
+  uint32_t ParityCheckOddErrorNb = 0;
+  uint32_t ParityCheckEvenErrorNb = 0;
 
+  //TODO: make this so we can load either rc interleave, or single burst interleave
   for(i = 0; i < 32; i++)
   {
-    DataMatrix[DeInterleaveReverseChannelBptc[i]] = InputInterleavedData[i] & 1;
+    DataMatrix[DeInterleaveReverseChannelBptcPlacement[DeInterleaveReverseChannelBptc[i]]] = InputInterleavedData[i] & 1;
   }
 
   /* Copy the entire input buffer to the output buffer */
   for(i = 0; i < 32; i++)
   {
-    DMRDataExtracted[i] = DataMatrix[i];
+    DMRDataExtracted[i] = DataMatrix[i] & 1;
   }
 
   /* Prepare the line to be corrected */
   for(i = 0; i < 16; i++)
   {
-    LineUncorrected[i] = DataMatrix[i];
+    LineUncorrected[i] = DataMatrix[i] & 1;
   }
 
   /* Apply Hamming (16,11,4) code correction */
@@ -536,7 +548,7 @@ uint32_t BPTC_16x2_Extract_Data(uint8_t InputInterleavedData[32], uint8_t DMRDat
   /* Copy the corrected content to the output buffer */
   for(i = 0; i < 11; i++)
   {
-    DMRDataExtracted[i] = LineCorrected[i];
+    DMRDataExtracted[i] = LineCorrected[i] & 1;
   }
 
   /* Check Parity bits */
@@ -544,14 +556,24 @@ uint32_t BPTC_16x2_Extract_Data(uint8_t InputInterleavedData[32], uint8_t DMRDat
   {
     /* Odd parity ==> If data = 1 then parity = 0
      *                If data = 0 then parity = 1 */
-    if(DMRDataExtracted[i] == DMRDataExtracted[i + 16]) ParityCheckErrorNb++;
+    if((DMRDataExtracted[i] & 1) == (DMRDataExtracted[i + 16] & 1)) ParityCheckOddErrorNb++;
+    if((DMRDataExtracted[i] & 1) != (DMRDataExtracted[i + 16] & 1)) ParityCheckEvenErrorNb++;
   }
 
-  //fprintf(stderr, "Hamming ERR=%u ; Parity ERR=%u", HammingIrrecoverableErrorNb, ParityCheckErrorNb);
+  //fprintf(stderr, "Hamming ERR=%u ; Parity odd ERR=%u, Parity even ERR=%u, ", HammingIrrecoverableErrorNb, ParityCheckOddErrorNb, ParityCheckEvenErrorNb);
+
+  //fprintf(stderr, "Content =\n");
+  //for(i = 0; i < 32; i++)
+  //{
+  //  fprintf(stderr, "%u", DMRDataExtracted[i] & 1);
+  //  if((i == 15) || (i == 31)) fprintf(stderr, "\n");
+  //  else fprintf(stderr, "-");
+  //}
 
   /* Return the number of irrecoverable Hamming errors +
    * the number of parity check error */
-  return (HammingIrrecoverableErrorNb + ParityCheckErrorNb);
+  if(ParityCheckTypeOdd) return (HammingIrrecoverableErrorNb + ParityCheckOddErrorNb);
+  else return (HammingIrrecoverableErrorNb + ParityCheckEvenErrorNb);
 
 } /* End BPTC_16x2_Extract_Data() */
 

src/dmr_34.c

@@ -0,0 +1,214 @@
+/*-------------------------------------------------------------------------------
+ * dmr_34.c
+ * DMR (and P25) 3/4 Rate Simple Trellis Decoder
+ *
+ * LWVMOBILE
+ * 2023-12 DSD-FME Florida Man Edition
+ *-----------------------------------------------------------------------------*/
+
+#include "dsd.h"
+
+uint8_t 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 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 fsm[64] = {
+0,  8, 4, 12, 2, 10, 6, 14,
+4, 12, 2, 10, 6, 14, 0,  8,
+1,  9, 5, 13, 3, 11, 7, 15,
+5, 13, 3, 11, 7, 15, 1,  9,
+3, 11, 7, 15, 1,  9, 5, 13,
+7, 15, 1,  9, 5, 13, 3, 11,
+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
+
+  uint8_t deinterleaved_dibits[98];
+  memset (deinterleaved_dibits, 0, sizeof(deinterleaved_dibits));
+
+  //deinterleave our input dibits
+  for (i = 0; i < 98; i++)
+    deinterleaved_dibits[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] = 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 tribit values using the FSM
+  uint8_t state = 0;
+  uint32_t tribits[49];
+  memset (tribits, 0xF, sizeof(tribits));
+
+  for (i = 0; i < 49; i++)
+  {
+
+    for (j = 0; j < 8; j++)
+    {
+      if ( fsm[(state*8)+j] == point[i] )
+      {
+        //return our tribit value and state for the next point
+        tribits[i] = state = (uint8_t)j;
+        break;
+      }
+    }
+
+    //if tribit value is greater than 7, then we have a decoding error
+    if (tribits[i] > 7)
+    {
+      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);
+
+      //Make a hard decision and flip point to fit in current state
+      // point[i] ^= 7; //lucky number 7 (0111) //fallback
+
+      //decrement one and resume decoding
+      i--;
+     
+    }
+
+  }
+
+  //debug view tribits/states
+  // fprintf (stderr, "\n T =");
+  // for (i = 0; i < 49; i++) 
+  //   fprintf (stderr, " %02d", tribits[i]);
+
+  //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++)
+  {
+    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;
+  }
+
+  //trellis point/state err tally
+  // if (irr_err != 0)
+  //   fprintf (stderr, " P_ERR = %d", irr_err);
+
+  return (0);
+}
+

src/dmr_data.c

@@ -18,35 +18,33 @@
 #include "dsd.h"
 
 void
-processDMRdata (dsd_opts * opts, dsd_state * state)
+dmr_data_sync (dsd_opts * opts, dsd_state * state)
 {
 
   int i, dibit;
   int *dibit_p;
   char sync[25];
   char syncdata[48];
-  char cachdata[25] = {0}; 
+  uint8_t cachdata[25];
-  char cc[5] = {0};
+  UNUSED(syncdata);
-  char ccAscii[5] = {0};
-  char bursttype[5];
-  unsigned int burst;
-  char info[196];
 
+  uint8_t burst;
+  char info[196];
   unsigned char SlotType[20]; 
   unsigned int SlotTypeOk;
-  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};
+  uint8_t cach_err = 0;
+  UNUSED(cach_err);
 
-#ifdef DMR_DUMP
+  int cachInterleave[24] = 
-  char syncbits[49];
+  {0, 7, 8, 9, 1, 10,
-  char cachbits[25];
+   11, 12, 2, 13, 14,
-  int k;
+   15, 3, 16, 4, 17, 18,
-#endif
+   19, 5, 20, 21, 22, 6, 23
-
+  };
-  ccAscii[4] = 0;
-  bursttype[4] = 0;
 
   dibit_p = state->dmr_payload_p - 90;
-  // CACH
+  
+  //collect cach and de-interleave
   for (i = 0; i < 12; i++)
   {
     dibit = *dibit_p;
@@ -59,73 +57,38 @@ processDMRdata (dsd_opts * opts, dsd_state * state)
     {
       dibit = (int)state->dmr_stereo_payload[i];
     }
+    else state->dmr_stereo_payload[i] = dibit;
 
     cachdata[cachInterleave[(i*2)]]   = (1 & (dibit >> 1)); // bit 1
     cachdata[cachInterleave[(i*2)+1]] = (1 & dibit);       // bit 0
 
   }
 
-  //decode and correct cach and compare
+  //seperate tact bits from cach
-  int cach_okay = 69;
+  uint8_t tact_bits[7];
-  if ( Hamming_7_4_decode (cachdata) ) //is now de-interleaved appropriately
+  for (i = 0; i < 7; i++)
   {
-    cach_okay = 1;
+    tact_bits[i] = cachdata[i];
-  }
-  if (cach_okay == 1)
-  {
-    //fprintf (stderr, "CACH Okay ");
-  }
-  if (cach_okay != 1)
-  {
-    //fprintf (stderr, "CACH FEC Error %d", cach_okay);
-    if (opts->aggressive_framesync == 1) //may not worry about it on data
-    {
-      goto END;
-    }
-    
   }
 
-  state->currentslot = cachdata[1]; 
+  //run hamming on tact bits
+  int cach_okay = -1;
+  if ( Hamming_7_4_decode (tact_bits) ) cach_okay = 1;
+  else
+  {
+    cach_okay = -1;
+    SlotTypeOk = 0;
+    goto END;
+  }
 
-  //minor bugfix for MSData when MSData has accumulated data blocks
+  state->currentslot = tact_bits[1];
-  //(i.e. data header and 1/2 rate data), force all data into slot 0
+
+  //in the future, maybe we will remove the hard set on this
   if (state->dmr_ms_mode == 1)
   {
     state->currentslot = 0;
   }
 
-  if (state->currentslot == 0 && state->dmr_ms_mode == 0)
-  {
-    state->slot1light[0] = '[';
-    state->slot1light[6] = ']';
-    state->slot2light[0] = ' ';
-    state->slot2light[6] = ' ';
-  }
-  //else
-  if (state->currentslot == 1 && state->dmr_ms_mode == 0)
-  {
-    state->slot2light[0] = '[';
-    state->slot2light[6] = ']';
-    state->slot1light[0] = ' ';
-    state->slot1light[6] = ' ';
-  }
-  //end correct cach and set slot
-
-#ifdef DMR_DUMP
-  k = 0;
-  for (i = 0; i < 12; i++)
-  {
-    dibit = cachdata[i];
-    cachbits[k] = (1 & (dibit >> 1)) + 48;    // bit 1
-    k++;
-    cachbits[k] = (1 & dibit) + 48;   // bit 0
-    k++;
-  }
-  cachbits[24] = 0;
-  fprintf(stderr, "%s ", cachbits);
-#endif
-  //trellis bits
-  unsigned char trellisdibits[98];
   // Current slot - First half - Data Payload - 1st part
   for (i = 0; i < 49; i++)
   {
@@ -139,7 +102,7 @@ processDMRdata (dsd_opts * opts, dsd_state * state)
     {
       dibit = (int)state->dmr_stereo_payload[i+12];
     }
-    trellisdibits[i] = dibit;
+    else state->dmr_stereo_payload[i+12] = dibit;
     info[2*i]     = (1 & (dibit >> 1));  // bit 1
     info[(2*i)+1] = (1 & dibit);         // bit 0
   }
@@ -153,10 +116,10 @@ processDMRdata (dsd_opts * opts, dsd_state * state)
   }
   if (state->dmr_stereo == 1)
   {
-    dibit = (int)state->dmr_stereo_payload[61]; //61, not i+61
+    dibit = (int)state->dmr_stereo_payload[61]; 
   }
-  cc[0] = (1 & (dibit >> 1)); // bit 1
+  else state->dmr_stereo_payload[61] = dibit;
-  cc[1] = (1 & dibit);        // bit 0
+
   SlotType[0] = (1 & (dibit >> 1)); // bit 1
   SlotType[1] = (1 & dibit);        // bit 0
 
@@ -170,17 +133,11 @@ processDMRdata (dsd_opts * opts, dsd_state * state)
   {
     dibit = (int)state->dmr_stereo_payload[62];
   }
-  cc[2] = (1 & (dibit >> 1)); // bit 1
+  else state->dmr_stereo_payload[62] = dibit;
-  cc[3] = (1 & dibit);        // bit 0
+
   SlotType[2] = (1 & (dibit >> 1)); // bit 1
   SlotType[3] = (1 & dibit);        // bit 0
 
-  ccAscii[0] = cc[0] + '0';
-  ccAscii[1] = cc[1] + '0';
-  ccAscii[2] = cc[2] + '0';
-  ccAscii[3] = cc[3] + '0';
-  ccAscii[4] = cc[4] + '\0';
-
   dibit = *dibit_p;
   dibit_p++;
   if (opts->inverted_dmr == 1)
@@ -189,8 +146,9 @@ processDMRdata (dsd_opts * opts, dsd_state * state)
   }
   if (state->dmr_stereo == 1) //state
   {
-    dibit = (int)state->dmr_stereo_payload[63]; //(int)
+    dibit = (int)state->dmr_stereo_payload[63]; 
   }
+  else state->dmr_stereo_payload[63] = dibit;
 
   SlotType[4]  = (1 & (dibit >> 1)); // bit 1
   SlotType[5]  = (1 & dibit);        // bit 0
@@ -203,8 +161,9 @@ processDMRdata (dsd_opts * opts, dsd_state * state)
   }
   if (state->dmr_stereo == 1) //state
   {
-    dibit = (int)state->dmr_stereo_payload[64]; //(int)
+    dibit = (int)state->dmr_stereo_payload[64]; 
   }
+  else state->dmr_stereo_payload[64] = dibit;
 
   SlotType[6]  = (1 & (dibit >> 1)); // bit 1
   SlotType[7]  = (1 & dibit);        // bit 0
@@ -220,10 +179,11 @@ processDMRdata (dsd_opts * opts, dsd_state * state)
   {
     dibit = (int)state->dmr_stereo_payload[65];
   }
+  else state->dmr_stereo_payload[65] = dibit;
   SlotType[8] = (1 & (dibit >> 1)); // bit 1
   SlotType[9] = (1 & dibit);        // bit 0
 
-  // signalling data or sync
+  // signaling data or sync
   for (i = 0; i < 24; i++)
   {
     dibit = *dibit_p;
@@ -236,35 +196,24 @@ processDMRdata (dsd_opts * opts, dsd_state * state)
     {
       dibit = (int)state->dmr_stereo_payload[i+66]; 
     }
+    else state->dmr_stereo_payload[i+66] = dibit;
+
     syncdata[2*i]     = (1 & (dibit >> 1));  // bit 1
     syncdata[(2*i)+1] = (1 & dibit);         // bit 0
     sync[i] = (dibit | 1) + 48;
-
-
   }
   sync[24] = 0; 
 
-#ifdef DMR_DUMP
+  if((strcmp (sync, DMR_BS_DATA_SYNC) == 0) )
-  k = 0;
-  for (i = 0; i < 24; i++)
-  {
-    syncbits[k] = syncdata[(k*2)] + 48;    // bit 1
-    k++;
-    syncbits[k] = syncdata[(k*2)+1] + 48;   // bit 0
-    k++;
-  }
-  syncbits[48] = 0;
-  fprintf(stderr, "%s ", syncbits);
-#endif
-
-  if((strcmp (sync, DMR_BS_DATA_SYNC) == 0) )//|| (strcmp (sync, DMR_MS_DATA_SYNC) == 0))
   {
     if (state->currentslot == 0)
     {
       sprintf(state->slot1light, "[slot1]");
+      sprintf(state->slot2light, " slot2 ");
     }
     else
     {
+      sprintf(state->slot1light, " slot1 ");
       sprintf(state->slot2light, "[slot2]");
     }
   }
@@ -273,15 +222,17 @@ processDMRdata (dsd_opts * opts, dsd_state * state)
   {
     state->currentslot = 0;
     sprintf(state->slot1light, "[sLoT1]");
+    sprintf(state->slot2light, "[DMODE]");
   }
 
   else if(strcmp (sync, DMR_DIRECT_MODE_TS2_DATA_SYNC) == 0)
   {
     state->currentslot = 1;
+    sprintf(state->slot1light, "[DMODE]");
     sprintf(state->slot2light, "[sLoT2]");
   }
 
-  if (opts->errorbars == 1 && state->dmr_ms_mode == 0)
+  if (state->dmr_ms_mode == 0)
   {
     fprintf(stderr, "%s %s ", state->slot1light, state->slot2light);
   }
@@ -289,283 +240,121 @@ processDMRdata (dsd_opts * opts, dsd_state * state)
   // Slot type - Second part - Parity bit
   for (i = 0; i < 5; i++)
   {
-    if (state->dmr_stereo == 0) //only get dibits if not using dmr_stereo method
+    if (state->dmr_stereo == 0) 
     {
       dibit = getDibit(opts, state);
-    }
+      state->dmr_stereo_payload[i+90] = dibit;
-    if (opts->inverted_dmr == 1)
-    {
-      //dibit = (dibit ^ 2);
     }
     if (state->dmr_stereo == 1)
     {
-      dibit = (int)state->dmr_stereo_payload[i+90]; //double checked these i+ values make sure we are on the right ones
+      dibit = (int)state->dmr_stereo_payload[i+90]; 
     }
     SlotType[(i*2) + 10] = (1 & (dibit >> 1)); // bit 1
     SlotType[(i*2) + 11] = (1 & dibit);        // bit 0
   }
 
   /* Check and correct the SlotType (apply Golay(20,8) FEC check) */
-
+  
   // golay (20,8) hamming-weight of 6 reliably corrects at most 2 bit-errors
-  if( Golay_20_8_decode(SlotType) )
+  if( Golay_20_8_decode(SlotType) ) SlotTypeOk = 1;
-  {
-    SlotTypeOk = 1;
-    //fprintf (stderr, "Slot Okay ");
-  }
   else
   {
-    
+    SlotTypeOk = 0;
-    if (opts->aggressive_framesync == 1)
+    goto END;
-    {
-      SlotTypeOk = 0;
-      goto END;
-    }
-    
   }
 
-  /* Slot Type parity checked => Fill the color code */
   state->color_code = (SlotType[0] << 3) + (SlotType[1] << 2) +(SlotType[2] << 1) + (SlotType[3] << 0);
   state->color_code_ok = SlotTypeOk;
 
-  /* Reconstitute the burst type */
+  //not sure why I still have two variables for this, need to look and see what state->color_code still ties into
-  //consider assigning this only when slottypeok or similar check passes, eliminate bad burst types from decoding randomly
+  if (SlotTypeOk == 1) state->dmr_color_code = state->color_code;
-  burst = (unsigned int)((SlotType[4] << 3) + (SlotType[5] << 2) + (SlotType[6] << 1) + SlotType[7]);
-  if (state->currentslot == 0)
-  {
-    state->dmrburstL = burst;
-  }
-  if (state->currentslot == 1)
-  {
-    state->dmrburstR = burst;
-  }
 
   /* Reconstitute the burst type */
-  bursttype[0] = SlotType[4] + '0';
+  burst = (uint8_t)((SlotType[4] << 3) + (SlotType[5] << 2) + (SlotType[6] << 1) + SlotType[7]);
-  bursttype[1] = SlotType[5] + '0';
+  if (state->currentslot == 0) state->dmrburstL = burst;
-  bursttype[2] = SlotType[6] + '0';
+  if (state->currentslot == 1) state->dmrburstR = burst;
-  bursttype[3] = SlotType[7] + '0';
-  bursttype[4] = '\0';
 
-  if (strcmp (bursttype, "0000") == 0)
-  {
-    sprintf(state->fsubtype, " PI Header    ");
-  }
-  else if (strcmp (bursttype, "0001") == 0)
-  {
-    sprintf(state->fsubtype, " VOICE LC     ");
-  }
-  else if (strcmp (bursttype, "0010") == 0)
-  {
-    sprintf(state->fsubtype, " TLC          ");
-  }
-  else if (strcmp (bursttype, "0011") == 0)
-  {
-    sprintf(state->fsubtype, " CSBK         ");
-  }
-  else if (strcmp (bursttype, "0100") == 0)
-  {
-    sprintf(state->fsubtype, " MBC Header   ");
-  }
-  else if (strcmp (bursttype, "0101") == 0)
-  {
-    sprintf(state->fsubtype, " MBC          ");
-  }
-  else if (strcmp (bursttype, "0110") == 0)
-  {
-    sprintf(state->fsubtype, " DATA Header  ");
-  }
-  else if (strcmp (bursttype, "0111") == 0)
-  {
-    sprintf(state->fsubtype, " RATE 1/2 DATA");
-  }
-  else if (strcmp (bursttype, "1000") == 0)
-  {
-    sprintf(state->fsubtype, " RATE 3/4 DATA");
-  }
-  else if (strcmp (bursttype, "1001") == 0)
-  {
-    sprintf(state->fsubtype, " Slot idle    ");
-  }
-  else if (strcmp (bursttype, "1010") == 0)
-  {
-    sprintf(state->fsubtype, " Rate 1 DATA  ");
-  }
-  else
-  {
-    sprintf(state->fsubtype, "              ");
-  }
 
-  // Current slot - First half - Data Payload - 1st part
+  // Current slot - Second Half - Data Payload - 2nd part
-  //trellis
   for (i = 0; i < 49; i++)
   {
-    if (state->dmr_stereo == 0) //only get dibits if not using dmr_stereo method
+    if (state->dmr_stereo == 0) 
     {
       dibit = getDibit(opts, state);
+      state->dmr_stereo_payload[i+95] = dibit;
     }
-    if (opts->inverted_dmr == 1)
+
-    {
-      //dibit = (dibit ^ 2);
-    }
     if (state->dmr_stereo == 1)
     {
-      dibit = (int)state->dmr_stereo_payload[i+95]; //double checked these i+ values make sure we are on the right ones
+      dibit = (int)state->dmr_stereo_payload[i+95]; 
     }
-    trellisdibits[i+49] = dibit;
+
     info[(2*i) + 98] = (1 & (dibit >> 1));  // bit 1
     info[(2*i) + 99] = (1 & dibit);         // bit 0
   }
+  
+  //don't run on MS Reverse Channel Data
+  if (state->dmr_ms_rc == 0) dmr_data_burst_handler(opts, state, (uint8_t *)info, burst);
 
-  // Skip cach (24 bit = 12 dibit) and next slot 1st half (98 + 10 bit = 49 + 5 dibit)
+  //don't run cach on simplex or mono
-  if (state->dmr_stereo == 0)
+  if (state->dmr_ms_mode == 0 && opts->dmr_mono == 0)
   {
-    skipDibit (opts, state, 12 + 49 + 5);
+    cach_err = dmr_cach (opts, state, cachdata);
-  }
+  } 
 
-  if (opts->errorbars == 1)
+  //ending line break
-  {
+  fprintf(stderr, "\n");
-    /* Print the color code */
-    //if (burst == 0b1001 && state->color_code_ok) //only print on idle for data types, otherwise prints on voice frames.
-    if (SlotTypeOk == 1)
-    {
-      fprintf (stderr, "%s", KCYN);
-      fprintf(stderr, "| Color Code=%02d ", (int)state->color_code);
-      fprintf (stderr, "%s", KNRM);
-      //state->dmr_color_code = state->color_code;
-    }
-    else fprintf(stderr, "|               ");
 
-    //if(state->color_code_ok) fprintf(stderr, "(OK)      |");
-    if(state->color_code_ok) fprintf(stderr, "| (CRC OK ) |"); //add line break
-    else
-    {
-      fprintf (stderr, "%s", KRED);
-      fprintf(stderr, "| (CRC ERR) |");
-      fprintf (stderr, "%s", KNRM);
-    }
-    //fprintf (stderr, "\n"); //print line break
-    if (strcmp (state->fsubtype, "              ") == 0)
-    {
-      //fprintf(stderr, " Unknown burst type: %s", bursttype);
-      fprintf(stderr, " Unknown");
-    }
-    else
-    {
-      fprintf(stderr, "%s", state->fsubtype);
-    }
-  }
-
-  switch(burst)
-  {
-    /* Burst = PI header */
-    case 0b0000:
-    {
-      ProcessDmrPIHeader(opts, state, (uint8_t *)info, (uint8_t *)syncdata, (uint8_t *)SlotType);
-      break;
-    }
-
-    /* Burst = Voice LC header */
-    case 0b0001:
-    {
-      /* Extract data from Voice LC Header */
-      ProcessDmrVoiceLcHeader(opts, state, (uint8_t *)info, (uint8_t *)syncdata, (uint8_t *)SlotType);
-      break;
-    }
-
-    /* Burst = TLC */
-    case 0b0010:
-    {
-      //Not sure if I really care about this in the context of what it shows
-      ProcessDmrTerminaisonLC(opts, state, (uint8_t *)info, (uint8_t *)syncdata, (uint8_t *)SlotType);
-      break;
-    }
-
-    /* Burst = CSBK */
-    case 0b0011:
-    {
-      //going to disable until I can find more useful info to present
-      ProcessCSBK(opts, state, (uint8_t *)info, (uint8_t *)syncdata, (uint8_t *)SlotType);
-      break;
-    }
-
-    /* Burst = MBC Header */
-    case 0b0100:
-    {
-      ProcessMBChData(opts, state, (uint8_t *)info, (uint8_t *)syncdata, (uint8_t *)SlotType);
-      break;
-    }
-
-    /* Burst = MBC Continuation*/
-    case 0b0101:
-    {
-      ProcessMBCData(opts, state, (uint8_t *)info, (uint8_t *)syncdata, (uint8_t *)SlotType);
-      break;
-    }
-
-    /* Burst = DATA Header */
-    case 0b0110:
-    {
-      ProcessDataData(opts, state, (uint8_t *)info, (uint8_t *)syncdata, (uint8_t *)SlotType);
-      break;
-    }
-
-    /* Burst = RATE 1/2 DATA */
-    case 0b0111:
-    {
-      Process12Data(opts, state, (uint8_t *)info, (uint8_t *)syncdata, (uint8_t *)SlotType);
-      break;
-    }
-
-    /* Burst = RATE 3/4 DATA */
-    case 0b1000:
-    {
-      //need to keep working on improving the trellis decode, but is partially viable now
-      Process34Data(opts, state, trellisdibits, (uint8_t *)syncdata, (uint8_t *)SlotType);
-      break;
-    }
-
-    /* Burst = Slot idle */
-    case 0b1001:
-    {
-      if(state->color_code_ok && state->dmr_stereo == 0) state->dmr_color_code = state->color_code; //try setting this on idle if crc ok
-      break;
-    }
-
-    /* Burst = Rate 1 DATA */
-    case 0b1010:
-    {
-      Process1Data(opts, state, (uint8_t *)info, (uint8_t *)syncdata, (uint8_t *)SlotType);
-      break;
-    }
-
-    /* Burst = Unified Single Block DATA */
-    case 0b1101:
-    {
-      ProcessUnifiedData(opts, state, (uint8_t *)info, (uint8_t *)syncdata, (uint8_t *)SlotType);
-      break;
-    }
-
-    /* Default */
-    default:
-    {
-      /* Nothing to do */
-      ProcessReservedData(opts, state, (uint8_t *)info, (uint8_t *)syncdata, (uint8_t *)SlotType);
-      break;
-    }
-  } /* End switch(burst) */
-
-  if (opts->errorbars == 1)
-  {
-    fprintf(stderr, "\n");
-  }
   END:
   if (SlotTypeOk == 0 || cach_okay != 1)
   {
     fprintf (stderr, "%s", KRED);
-    fprintf (stderr, "| ** CACH or Burst Type FEC ERR ** ");
+    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
   }
 
-} /* End processDMRdata() */
+  // Skip cach (24 bit = 12 dibit) and next slot 1st half (98 + 10 bit = 49 + 5 dibit)
+  if (state->dmr_stereo == 0) 
+  {
+    skipDibit (opts, state, 12 + 49 + 5);
+  }
+
+  //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)
+  {
+    //bug fixed that caused hopping from CC to VC; decreased to 2 seconds.
+    time_t waitsec = 2;
+    if (opts->trunk_tune_data_calls == 1)
+      waitsec = 4; //increase time for a data call before hopping
+    if ( (time(NULL) - state->last_vc_sync_time > waitsec) ) 
+    {
+      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);
+        //debug
+        fprintf (stderr, " Con+ Timeout; Return to CC;");
+      }
+
+      else if (opts->audio_in_type == 3) //rtl_fm tuning
+      {
+        #ifdef USE_RTLSDR
+        rtl_dev_tune(opts, state->p25_cc_freq);
+        //debug
+        fprintf (stderr, " Con+ Timeout; Return to CC;");
+        #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
+    }
+  }
+
+} 

src/dmr_dburst.c

@@ -0,0 +1,642 @@
+/*-------------------------------------------------------------------------------
+ * dmr_dburst.c
+ * DMR Data Burst Handling and related BPTC/FEC/CRC Functions
+ *
+ * Portions of BPTC/FEC/CRC code from LouisErigHerve
+ * Source: https://github.com/LouisErigHerve/dsd/blob/master/src/dmr_sync.c
+ *
+ * LWVMOBILE
+ * 2023-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
+
+#include "dsd.h"
+
+void dmr_data_burst_handler(dsd_opts * opts, dsd_state * state, uint8_t info[196], uint8_t databurst) 
+{
+
+  uint32_t i, j, k;
+  uint32_t CRCExtracted     = 0;
+  uint32_t CRCComputed      = 0;
+  uint32_t CRCCorrect       = 0;
+  uint32_t IrrecoverableErrors = 0;
+  uint8_t slot = state->currentslot;
+
+  //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];
+  uint8_t  BPTCDmrDataBit[96];
+  uint8_t  BPTCDmrDataByte[12];
+
+  //Embedded Signalling Specific
+  uint8_t  BptcDataMatrix[8][16];
+  uint8_t  LC_DataBit[77];
+  uint8_t  LC_DataBytes[10];
+  int Burst = -1;
+
+  memset (BPTCDeInteleavedData, 0, sizeof(BPTCDeInteleavedData));
+  memset (BPTCDmrDataBit, 0, sizeof(BPTCDmrDataBit));
+  memset (BPTCDmrDataByte, 0, sizeof(BPTCDmrDataByte));
+  memset (BptcDataMatrix, 0, sizeof(BptcDataMatrix));
+  memset (LC_DataBit, 0, sizeof(LC_DataBit));
+  memset (LC_DataBytes, 0, sizeof(LC_DataBytes));
+
+  //PDU Bytes and Bits
+  uint8_t  DMR_PDU[25]; 
+  uint8_t  DMR_PDU_bits[196]; 
+  memset (DMR_PDU, 0, sizeof (DMR_PDU));
+  memset (DMR_PDU_bits, 0, sizeof (DMR_PDU_bits));
+
+  uint8_t  R[3];
+  uint8_t  BPTCReservedBits = 0;
+  uint8_t  is_ras = 0;
+  uint8_t  crc_original_validity = 0;
+
+  uint32_t crcmask = 0; 
+  uint8_t  crclen = 0;
+
+  uint8_t is_bptc = 0;
+  uint8_t is_trellis = 0; 
+  uint8_t is_emb = 0;
+  uint8_t is_lc = 0;  
+  uint8_t is_full = 0;
+  uint8_t is_udt = 0; 
+  uint8_t pdu_len = 0;
+  uint8_t pdu_start = 0; //starting value of pdu (0 normal, 2 for confirmed)
+
+  uint8_t usbd_st = 0; //usbd service type 
+
+  switch(databurst){
+    case 0x00: //PI
+      is_bptc = 1;
+      crclen = 16;
+      crcmask = 0x6969; //insert pi and 69 jokes here
+      pdu_len = 12; //12 bytes
+      sprintf(state->fsubtype, " PI  ");
+      break;
+    case 0x01: //VLC
+      is_bptc = 1;
+      is_lc = 1;
+      crclen = 24;
+      crcmask = 0x969696; 
+      pdu_len = 12; //12 bytes
+      sprintf(state->fsubtype, " VLC ");
+      break;
+    case 0x02: //TLC
+      is_bptc = 1;
+      is_lc = 1;
+      crcmask = 0x999999; 
+      crclen = 24;
+      pdu_len = 12; //12 bytes
+      sprintf(state->fsubtype, " TLC ");
+      break;
+    case 0x03: //CSBK
+      is_bptc = 1;
+      crclen = 16;
+      crcmask = 0xA5A5; 
+      pdu_len = 12; //12 bytes
+      sprintf(state->fsubtype, " CSBK");
+      break;
+    case 0x04: //MBC Header
+      is_bptc = 1;
+      crclen = 16;
+      crcmask = 0xAAAA;
+      pdu_len = 12; //12 bytes
+      sprintf(state->fsubtype, " MBCH");
+      break;
+    case 0x05: //MBC Continuation
+      is_bptc = 1;
+      //let block assembler carry out crc on the completed message
+      pdu_len = 12; //12 bytes
+      sprintf(state->fsubtype, " MBCC");
+      break;
+    case 0x06: //Data Header
+      is_bptc = 1;
+      crclen = 16;
+      crcmask = 0xCCCC;
+      pdu_len = 12; //12 bytes
+      sprintf(state->fsubtype, " DATA");
+      break;
+    case 0x07: //1/2 Rate Data
+      is_bptc = 1;
+      crclen = 9; //confirmed data only
+      crcmask = 0x0F0; 
+      pdu_len = 12; //12 bytes unconfirmed
+      sprintf(state->fsubtype, " R12U ");
+      if (state->data_conf_data[slot] == 1)
+      {
+        pdu_len = 10; 
+        pdu_start = 2; //start at plus two when assembling
+        sprintf(state->fsubtype, " R12C ");
+      }
+      if (state->data_header_format[slot] == 0) //UDT 1/2 Encoded Blocks
+      {
+        is_udt = 1; 
+        sprintf(state->fsubtype, " UDTC ");
+      }
+      break;
+    case 0x08: //3/4 Rate Data
+      is_trellis = 1;
+      crclen = 9; //confirmed data only
+      crcmask = 0x1FF;
+      pdu_len = 18; //18 bytes unconfirmed
+      sprintf(state->fsubtype, " R34U ");
+      if (state->data_conf_data[slot] == 1)
+      {
+        pdu_len = 16; 
+        pdu_start = 2; //start at plus two when assembling
+        sprintf(state->fsubtype, " R34C ");
+      } 
+      break;
+    case 0x09: //Idle
+      //pseudo-random data fill, no need to do anything with this
+      sprintf(state->fsubtype, " IDLE ");
+      break;
+    case 0x0A: //1 Rate Data
+      crclen = 9; //confirmed data only
+      crcmask = 0x10F; 
+      is_full = 1;
+      pdu_len = 25; //196 bits - 24.5 bytes
+      sprintf(state->fsubtype, " R_1U ");
+      if (state->data_conf_data[slot] == 1)
+      {
+        pdu_len = 23; 
+        pdu_start = 2; //start at plus two when assembling
+        sprintf(state->fsubtype, " R_1C ");
+      }  
+      break;
+    case 0x0B: //Unified Single Block Data USBD
+      is_bptc = 1;
+      crclen = 16;
+      crcmask = 0x3333;
+      pdu_len = 12; //12 bytes
+      sprintf(state->fsubtype, " USBD ");
+      break;
+      
+    //special types (not real data 'sync' bursts)
+    case 0xEB: //Embedded Signalling
+      crclen = 5;
+      is_emb = 1;
+      pdu_len = 9;
+      break;
+
+    default:
+      //Slot Type FEC should catch this so we never see it,
+      //but if it doesn't, then we can still dump the entire 'packet'
+      //treat like rate 1 unconfirmed data 
+      is_full = 1;
+      pdu_len = 25; //196 bits - 24.5 bytes 
+      sprintf(state->fsubtype, " _UNK "); 
+      break;
+    
+  }
+
+  //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 (state->dmr_ms_mode == 0) fprintf(stderr, "| Color Code=%02d ", state->dmr_color_code);
+    fprintf(stderr, "|%s", state->fsubtype);
+
+    //'DSP' output to file
+    if (opts->use_dsp_output == 1)
+    {
+      FILE * pFile; //file pointer
+      pFile = fopen (opts->dsp_out_file, "a");
+      fprintf (pFile, "\n%d 98 ", slot+1); //'98' is CACH designation value
+      for (i = 0; i < 6; i++) //3 byte CACH
+      {
+        int cach_byte = (state->dmr_stereo_payload[i*2] << 2) | state->dmr_stereo_payload[i*2 + 1];
+        fprintf (pFile, "%X", cach_byte); //nibble, not a byte, next time I look at this and wonder why its not %02X
+      }
+      fprintf (pFile, "\n%d %02X ", slot+1, databurst); //use hex value of current data burst type
+      for (i = 6; i < 72; i++) //33 bytes, no CACH
+      {
+        int dsp_byte = (state->dmr_stereo_payload[i*2] << 2) | state->dmr_stereo_payload[i*2 + 1];
+        fprintf (pFile, "%X", dsp_byte);
+      }
+      fclose (pFile);
+    }
+  }
+  
+  //Most Data Sync Burst types will use the bptc 196x96
+  if (is_bptc)
+  {
+    CRCExtracted = 0;
+    CRCComputed = 0;
+    IrrecoverableErrors = 0;
+
+    /* Deinterleave DMR data */
+    BPTCDeInterleaveDMRData(info, BPTCDeInteleavedData);
+
+    /* Extract the BPTC 196,96 DMR data */
+    IrrecoverableErrors = BPTC_196x96_Extract_Data(BPTCDeInteleavedData, BPTCDmrDataBit, R);
+
+    /* Fill the reserved bit (R(0)-R(2) of the BPTC(196,96) block) */
+    BPTCReservedBits = (R[0] & 0x01) | ((R[1] << 1) & 0x02) | ((R[2] << 2) & 0x04);
+
+    //debug print
+    //fprintf (stderr, " RAS? %X - %d %d %d", BPTCReservedBits, R[0], R[1], R[2]); 
+
+    /* Convert the 96 bits BPTC data into 12 bytes */
+    k = 0;
+    for(i = 0; i < 12; i++)
+    {
+      BPTCDmrDataByte[i] = 0;
+      for(j = 0; j < 8; j++)
+      {
+        BPTCDmrDataByte[i] = BPTCDmrDataByte[i] << 1;
+        BPTCDmrDataByte[i] = BPTCDmrDataByte[i] | (BPTCDmrDataBit[k] & 0x01);
+        k++;
+      }
+    }
+
+    /* Fill the CRC extracted (before Reed-Solomon (12,9) FEC correction) */
+    CRCExtracted = 0;
+    for(i = 0; i < crclen; i++) 
+    {
+      CRCExtracted = CRCExtracted << 1;
+      CRCExtracted = CRCExtracted | (uint32_t)(BPTCDmrDataBit[i + 96 - crclen] & 1); 
+    }
+
+    /* Apply the CRC mask (see DMR standard B.3.12 Data Type CRC Mask) */
+    CRCExtracted = CRCExtracted ^ crcmask;
+
+    /* Check/correct the BPTC data and compute the Reed-Solomon (12,9) CRC */ 
+    if (is_lc) CRCCorrect = ComputeAndCorrectFullLinkControlCrc(BPTCDmrDataByte, &CRCComputed, crcmask);
+
+    //set CRC to correct on unconfirmed 1/2 data blocks (for reporting due to no CRC available on these)
+    else if (state->data_conf_data[slot] == 0 && databurst == 0x7)
+    {
+      CRCComputed = 0;
+      CRCExtracted = 0;
+      CRCCorrect = 1;
+    } 
+
+    //run CRC9 on intermediate and last 1/2 confirmed data blocks
+    else if (state->data_conf_data[slot] == 1 && databurst == 0x7)
+    {
+      blockcounter = state->data_block_counter[slot]; //current block number according to the counter
+      dbsn = (uint32_t)ConvertBitIntoBytes(&BPTCDmrDataBit[0], 7) + 1; //recover data block serial number
+      CRCExtracted = (uint32_t)ConvertBitIntoBytes(&BPTCDmrDataBit[7], 9); //extract CRC from data
+      CRCExtracted = CRCExtracted ^ crcmask;
+
+      //reorganize the BPTCDmrDataBit array into confdatabits, just for CRC9 check
+      //need to find a sample to confirm this
+      for(i = 0; i < 80; i++) confdatabits[i] = BPTCDmrDataBit[i + 16];
+      for(i = 0; i < 7; i++) confdatabits[i + 80] = BPTCDmrDataBit[i];
+
+      CRCComputed = ComputeCrc9Bit(confdatabits, 87);
+      if (CRCExtracted == CRCComputed)
+      {
+        CRCCorrect = 1;
+        state->data_block_crc_valid[slot][blockcounter] = 1;
+      } 
+      else state->data_block_crc_valid[slot][blockcounter] = 0;
+
+    }
+
+    //run CCITT on other data forms
+    else 
+    {
+      CRCComputed = ComputeCrcCCITT(BPTCDmrDataBit); 
+      if (CRCComputed == CRCExtracted) CRCCorrect = 1;
+      else CRCCorrect = 0;
+    }
+
+    //set the 'RAS Flag', if no irrecoverable errors but bad crc, only when enabled by user (to prevent a lot of bad data CSBKs)
+    if (opts->aggressive_framesync == 0 && CRCCorrect == 0 && IrrecoverableErrors == 0 && BPTCReservedBits == 4) is_ras = 1; 
+
+    //make sure the system type isn't Hytera, but could just be bad decodes on bad sample
+    if (BPTCDmrDataByte[1] == 0x68) is_ras = 0;
+
+    //if this is a RAS system, set the CRC to okay if irrecoverable errors are okay
+    //if we don't do this, then we can't view some data (CSBKs on RAS enabled systems) 
+    if (is_ras == 1)
+    {
+      crc_original_validity = CRCCorrect;
+      CRCCorrect = 1;
+    } 
+
+    if (databurst == 0x04 || databurst == 0x06) //MBC Header, Data Header
+    {
+      if (CRCCorrect)
+      {
+        state->data_block_crc_valid[slot][0] = 1;
+      }
+      else state->data_block_crc_valid[slot][0] = 0;
+    }
+    
+    /* Convert corrected x bytes into x*8 bits */
+    for(i = 0, j = 0; i < pdu_len; i++, j+=8)
+    {
+      BPTCDmrDataBit[j + 0] = (BPTCDmrDataByte[i+pdu_start] >> 7) & 0x01;
+      BPTCDmrDataBit[j + 1] = (BPTCDmrDataByte[i+pdu_start] >> 6) & 0x01;
+      BPTCDmrDataBit[j + 2] = (BPTCDmrDataByte[i+pdu_start] >> 5) & 0x01;
+      BPTCDmrDataBit[j + 3] = (BPTCDmrDataByte[i+pdu_start] >> 4) & 0x01;
+      BPTCDmrDataBit[j + 4] = (BPTCDmrDataByte[i+pdu_start] >> 3) & 0x01;
+      BPTCDmrDataBit[j + 5] = (BPTCDmrDataByte[i+pdu_start] >> 2) & 0x01;
+      BPTCDmrDataBit[j + 6] = (BPTCDmrDataByte[i+pdu_start] >> 1) & 0x01;
+      BPTCDmrDataBit[j + 7] = (BPTCDmrDataByte[i+pdu_start] >> 0) & 0x01;
+    }
+
+    //convert to DMR_PDU and DMR_PDU_bits
+    for (i = 0; i < pdu_len; i++)
+    {
+      DMR_PDU[i] = BPTCDmrDataByte[i+pdu_start];
+    }
+
+    for (i = 0; i < pdu_len * 8; i++)
+    {
+      DMR_PDU_bits[i] = BPTCDmrDataBit[i];
+    }
+
+  }
+
+  //Embedded Signalling will use BPTC 128x77
+  if (is_emb)
+  {
+    
+    CRCExtracted = 0;
+    CRCComputed = 0;
+    IrrecoverableErrors = 0;
+
+    /* First step : Reconstitute the BPTC 16x8 matrix */
+    Burst = 1; /* Burst B to E contains embedded signaling data */
+    k = 0;
+    for(i = 0; i < 16; i++)
+    {
+      for(j = 0; j < 8; j++)
+      {
+        /* Only the LSBit of the byte is stored */
+        BptcDataMatrix[j][i] = state->dmr_embedded_signalling[slot][Burst][k+8];
+        k++;
+
+        /* Go on to the next burst once 32 bit
+        * of the SNYC have been stored */
+        if(k >= 32)
+        {
+          k = 0;
+          Burst++;
+        }
+      } /* End for(j = 0; j < 8; j++) */
+    } /* End for(i = 0; i < 16; i++) */
+
+    /* Extract the 72 LC bit (+ 5 CRC bit) of the matrix */
+    IrrecoverableErrors = BPTC_128x77_Extract_Data(BptcDataMatrix, LC_DataBit);
+
+    /* Reconstitute the 5 bit CRC */
+    CRCExtracted = (uint32_t)ConvertBitIntoBytes(&LC_DataBit[72], 5);
+
+    /* Compute the 5 bit CRC */
+    CRCComputed = ComputeCrc5Bit(LC_DataBit);
+
+    if(CRCExtracted == CRCComputed) CRCCorrect = 1;
+    else CRCCorrect = 0;
+      
+    for (i = 0; i < 72; i++)
+    {
+      DMR_PDU_bits[i] = LC_DataBit[i];
+    }
+
+    for (i = 0; i < 9; i++)
+    {
+      DMR_PDU[i] = (uint8_t)ConvertBitIntoBytes(&LC_DataBit[i*8], 8);
+    }
+
+  }
+
+  //the sexy one
+  if (is_trellis)
+  {
+    CRCExtracted = 0;
+    CRCComputed = 0;
+    IrrecoverableErrors = 1; 
+
+    uint8_t tdibits[98];
+    memset (tdibits, 0, sizeof(tdibits));
+
+    //reconstitute info bits into dibits for the trellis decoder
+    for (i = 0; i < 98; i++)
+      tdibits[i] = (info[i*2] << 1) | info[i*2+1]; 
+
+    uint8_t TrellisReturn[18];
+    memset (TrellisReturn, 0, sizeof(TrellisReturn));
+    IrrecoverableErrors = dmr_34(tdibits, TrellisReturn);
+
+    //NOTE: IrrecoverableErrors in this context are a tally of errors from trellis
+    //they may have been successfully corrected, the CRC will reveal as much
+
+    for (i = 0; i < pdu_len; i++)
+      DMR_PDU[i] = TrellisReturn[i+pdu_start]; 
+
+    for(i = 0, j = 0; i < 18; i++, j+=8)
+    {
+      DMR_PDU_bits[j + 0] = (TrellisReturn[i] >> 7) & 0x01;
+      DMR_PDU_bits[j + 1] = (TrellisReturn[i] >> 6) & 0x01;
+      DMR_PDU_bits[j + 2] = (TrellisReturn[i] >> 5) & 0x01;
+      DMR_PDU_bits[j + 3] = (TrellisReturn[i] >> 4) & 0x01;
+      DMR_PDU_bits[j + 4] = (TrellisReturn[i] >> 3) & 0x01;
+      DMR_PDU_bits[j + 5] = (TrellisReturn[i] >> 2) & 0x01;
+      DMR_PDU_bits[j + 6] = (TrellisReturn[i] >> 1) & 0x01;
+      DMR_PDU_bits[j + 7] = (TrellisReturn[i] >> 0) & 0x01;
+    }
+
+    //set CRC to correct on unconfirmed 3/4 data blocks (for reporting due to no CRC available on these)
+    if (state->data_conf_data[slot] == 0) CRCCorrect = 1;
+ 
+    //run CRC9 on intermediate and last 3/4 data blocks
+    else if (state->data_conf_data[slot] == 1)
+    {
+      blockcounter = state->data_block_counter[slot]; //current block number according to the counter
+      dbsn = (uint32_t)ConvertBitIntoBytes(&DMR_PDU_bits[0], 7) + 1; //recover data block serial number
+      CRCExtracted = (uint32_t)ConvertBitIntoBytes(&DMR_PDU_bits[7], 9); //extract CRC from data
+      CRCExtracted = CRCExtracted ^ crcmask;
+
+      //reorganize the DMR_PDU_bits array into confdatabits, just for CRC9 check
+      for(i = 0; i < 128; i++) confdatabits[i] = DMR_PDU_bits[i + 16];
+      for(i = 0; i < 7; i++) confdatabits[i + 128] = DMR_PDU_bits[i];
+
+      CRCComputed = ComputeCrc9Bit(confdatabits, 135); 
+      if (CRCExtracted == CRCComputed)
+      {
+        CRCCorrect = 1;
+        state->data_block_crc_valid[slot][blockcounter] = 1;
+      } 
+      else
+        state->data_block_crc_valid[slot][blockcounter] = 0;
+
+
+    }
+
+    //reorganize the DMR_PDU_bits into PDU friendly format (minus the dbsn and crc9)
+    memset (DMR_PDU_bits, 0, sizeof(DMR_PDU_bits));
+    for(i = 0, j = 0; i < pdu_len; i++, j+=8)
+    {
+      DMR_PDU_bits[j + 0] = (TrellisReturn[i+pdu_start] >> 7) & 0x01;
+      DMR_PDU_bits[j + 1] = (TrellisReturn[i+pdu_start] >> 6) & 0x01;
+      DMR_PDU_bits[j + 2] = (TrellisReturn[i+pdu_start] >> 5) & 0x01;
+      DMR_PDU_bits[j + 3] = (TrellisReturn[i+pdu_start] >> 4) & 0x01;
+      DMR_PDU_bits[j + 4] = (TrellisReturn[i+pdu_start] >> 3) & 0x01;
+      DMR_PDU_bits[j + 5] = (TrellisReturn[i+pdu_start] >> 2) & 0x01;
+      DMR_PDU_bits[j + 6] = (TrellisReturn[i+pdu_start] >> 1) & 0x01;
+      DMR_PDU_bits[j + 7] = (TrellisReturn[i+pdu_start] >> 0) & 0x01;
+    }
+
+  }
+
+  if (is_full) //Rate 1 Data
+  {
+    CRCExtracted = 0;
+    CRCComputed = 0;
+    IrrecoverableErrors = 0; //implicit, since there is no encoding
+
+    for (i = 0; i < 12; 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);
+
+    //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;
+ 
+    //run CRC9 on intermediate and last 1 rate data blocks
+    else if (state->data_conf_data[slot] == 1)
+    {
+      blockcounter = state->data_block_counter[slot]; //current block number according to the counter
+      dbsn = (uint32_t)ConvertBitIntoBytes(&info[0], 7) + 1; //recover data block serial number
+      CRCExtracted = (uint32_t)ConvertBitIntoBytes(&info[7], 9); //extract CRC from data
+      CRCExtracted = CRCExtracted ^ crcmask;
+
+      //reorganize the info bit array into confdatabits, just for CRC9 check
+      //unconfirmed, haven't seen any samples with rate 1 data
+      for(i = 0; i < 176; i++) confdatabits[i] = info[i + 16];
+      for(i = 0; i < 7; i++) confdatabits[i + 176] = info[i];
+
+      CRCComputed = ComputeCrc9Bit(confdatabits, 183); 
+      if (CRCExtracted == CRCComputed)
+      {
+        CRCCorrect = 1;
+        state->data_block_crc_valid[slot][blockcounter] = 1;
+      } 
+      else state->data_block_crc_valid[slot][blockcounter] = 0;
+
+    }
+
+    //copy info to dmr_pdu_bits
+    memcpy(DMR_PDU_bits, info, sizeof(DMR_PDU_bits));
+
+  }
+
+  
+  //time for some pi
+  if (databurst == 0x00) dmr_pi (opts, state, DMR_PDU, CRCCorrect, IrrecoverableErrors);
+
+  //full link control
+  if (databurst == 0x01) dmr_flco (opts, state, DMR_PDU_bits, CRCCorrect, IrrecoverableErrors, 1); //VLC
+  if (databurst == 0x02) dmr_flco (opts, state, DMR_PDU_bits, CRCCorrect, IrrecoverableErrors, 2); //TLC
+  if (databurst == 0xEB) dmr_flco (opts, state, DMR_PDU_bits, CRCCorrect, IrrecoverableErrors, 3); //EMB
+
+  //dmr data header and multi block types (header, 1/2, 3/4, 1, UDT) - type 1
+  if (databurst == 0x06) dmr_dheader (opts, state, DMR_PDU, DMR_PDU_bits, CRCCorrect, IrrecoverableErrors);
+  if (databurst == 0x08) dmr_block_assembler (opts, state, DMR_PDU, pdu_len, databurst, 1); //3/4 Rate Data
+  if (databurst == 0x0A) dmr_block_assembler (opts, state, DMR_PDU, pdu_len, databurst, 1); //Full Rate Data
+  if (databurst == 0x07 && is_udt == 0) dmr_block_assembler (opts, state, DMR_PDU, pdu_len, databurst, 1); //1/2 Rate Data
+  if (databurst == 0x07 && is_udt == 1) dmr_block_assembler (opts, state, DMR_PDU, pdu_len, databurst, 3); //UDT with 1/2 Rate Encoding
+
+  //control signalling types (CSBK, MBC)
+  if (databurst == 0x03) dmr_cspdu (opts, state, DMR_PDU_bits, DMR_PDU, CRCCorrect, IrrecoverableErrors);
+  
+  //both MBC header and MBC continuation will go to the block_assembler - type 2, and then to dmr_cspdu 
+  if (databurst == 0x04) 
+  {
+    state->data_block_counter[slot] = 0; //zero block counter before running header
+    state->data_header_valid[slot] = 1; //set valid header since we received one
+    dmr_block_assembler (opts, state, DMR_PDU, pdu_len, databurst, 2);
+  } 
+  if (databurst == 0x05) dmr_block_assembler (opts, state, DMR_PDU, pdu_len, databurst, 2);
+
+  //Unified Single Data Block (USBD) -- Not to be confused with Unified Data Transport (UDT)
+  if (databurst == 0x0B)
+  {
+    //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);
+    else if (usbd_st > 8) fprintf (stderr, "Manufacturer Specific Service %d ", usbd_st);
+    else fprintf (stderr, "Reserved %d ", usbd_st);
+  }
+
+  //set the original CRCCorrect back to its original value if the RAS flag was tripped
+  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 == 0 && databurst != 0x09 && databurst != 0x05)
+  // {
+  //   fprintf (stderr, "%s", KYEL);
+  //   fprintf(stderr, " (FEC OK)");
+  //   fprintf (stderr, "%s", KNRM);
+
+  // } 
+
+  if (IrrecoverableErrors != 0 && databurst != 0x08 && databurst != 0x09) //&& databurst != 0x05
+  {
+    fprintf (stderr, "%s", KRED);
+    fprintf(stderr, " (FEC ERR)");
+    fprintf (stderr, "%s", KNRM);
+  } 
+
+  //print whether or not the 'RAS Field' bits are set to indicate RAS enabled (to be verified)
+  if (is_ras == 1)
+  {
+    fprintf (stderr, "%s", KRED);
+    fprintf (stderr, " -RAS ");
+    //the value of this field seems to always, or usually, be 4, or just R[2] bit is set
+    if (opts->payload == 1) fprintf (stderr, "%X ", BPTCReservedBits);
+    fprintf (stderr, "%s", KNRM);
+  }
+  
+  if (IrrecoverableErrors == 0 && CRCCorrect == 0 && is_ras == 0 && databurst != 0x09 && databurst != 0x05)
+  {
+    fprintf (stderr, "%s", KRED);
+    fprintf (stderr, " (CRC ERR) ");
+    fprintf (stderr, "%s", KNRM);
+  }
+
+  //print the unified PDU format here, if not slot idle
+  if (opts->payload == 1 && databurst != 0x09)
+  {
+    fprintf (stderr, "\n");
+    fprintf (stderr, "%s", KCYN);
+    fprintf (stderr, " DMR PDU Payload ");
+    for (i = 0; i < pdu_len; i++)
+    {
+      fprintf (stderr, "[%02X]", DMR_PDU[i]);
+    }
+
+    //debug print
+    // if (dbsn) fprintf (stderr, " SN %X", dbsn);
+    // fprintf (stderr, " CRC - EXT %X CMP %X", CRCExtracted, CRCComputed);
+
+    fprintf (stderr, "%s", KNRM);
+    
+  }
+
+}
+

src/dmr_le.c

@@ -0,0 +1,483 @@
+/*-------------------------------------------------------------------------------
+ * dmr_le.c
+ * DMR Late Entry MI Fragment Assembly, Procesing, and related Alg functions
+ *
+ * LWVMOBILE
+ * 2022-12 DSD-FME Florida Man Edition
+ *-----------------------------------------------------------------------------*/
+
+#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])
+{
+  
+  uint8_t slot = state->currentslot;
+
+  //enforce RC4 due to missing PI header, but with valid SVC Opts
+  //ideally, this would be handled by VC-F single burst, but its not fully reliable compared to this
+  //due to multiple signalling occurring inside of it, depending on system type
+  if (state->M == 0x21)
+  {
+    if (slot == 0 && state->dmr_so & 0x40)
+    {
+      state->payload_algid = 0x21;
+      state->payload_keyid = 0xFF;
+    }
+    if (slot == 1 && state->dmr_soR & 0x40)
+    {
+      state->payload_algidR = 0x21;
+      state->payload_keyidR = 0xFF;
+    }
+  }
+  
+  //collect our fragments and place them into storage
+  state->late_entry_mi_fragment[slot][vc][0] = (uint64_t)ConvertBitIntoBytes(&ambe_fr[3][0], 4);
+  state->late_entry_mi_fragment[slot][vc][1] = (uint64_t)ConvertBitIntoBytes(&ambe_fr2[3][0], 4);
+  state->late_entry_mi_fragment[slot][vc][2] = (uint64_t)ConvertBitIntoBytes(&ambe_fr3[3][0], 4);
+
+  if (vc == 6) dmr_late_entry_mi (opts, state);
+
+}
+
+void dmr_late_entry_mi (dsd_opts * opts, dsd_state * state)
+{
+  UNUSED(opts);
+
+  uint8_t slot = state->currentslot;
+  int i, j;
+  int g[3]; 
+  unsigned char mi_go_bits[24]; 
+
+  uint64_t mi_test = 0;
+  uint64_t go_test = 0;
+  uint64_t mi_corrected = 0;
+  uint64_t go_corrected = 0;
+
+  uint8_t mi_bits[36];
+  memset (mi_bits, 0, sizeof(mi_bits));
+  uint8_t mi_crc_cmp = 0;
+  uint8_t mi_crc_ext = 1;
+  uint8_t mi_crc_ok = 0;
+  
+  mi_test = (state->late_entry_mi_fragment[slot][1][0] << 32L) | (state->late_entry_mi_fragment[slot][2][0] << 28) | (state->late_entry_mi_fragment[slot][3][0] << 24) |
+            (state->late_entry_mi_fragment[slot][1][1] << 20) | (state->late_entry_mi_fragment[slot][2][1] << 16) | (state->late_entry_mi_fragment[slot][3][1] << 12) |
+            (state->late_entry_mi_fragment[slot][1][2] << 8)  | (state->late_entry_mi_fragment[slot][2][2] << 4)  | (state->late_entry_mi_fragment[slot][3][2] << 0);
+
+  go_test = (state->late_entry_mi_fragment[slot][4][0] << 32L) | (state->late_entry_mi_fragment[slot][5][0] << 28) | (state->late_entry_mi_fragment[slot][6][0] << 24) |
+            (state->late_entry_mi_fragment[slot][4][1] << 20) | (state->late_entry_mi_fragment[slot][5][1] << 16) | (state->late_entry_mi_fragment[slot][6][1] << 12) |
+            (state->late_entry_mi_fragment[slot][4][2] << 8)  | (state->late_entry_mi_fragment[slot][5][2] << 4)  | (state->late_entry_mi_fragment[slot][6][2] << 0);
+
+  for (j = 0; j < 3; j++)
+  {
+    for (i = 0; i < 12; i++)
+    {
+      mi_go_bits[i] = (( mi_test << (i+j*12) ) & 0x800000000) >> 35; 
+      mi_go_bits[i+12] = (( go_test << (i+j*12) ) & 0x800000000) >> 35; 
+    }
+    //execute golay decode and assign pass or fail to g
+    if ( Golay_24_12_decode(mi_go_bits) ) g[j] = 1;
+    else g[j] = 0;
+
+    for (i = 0; i < 12; i++)
+    {
+      mi_corrected = mi_corrected << 1;
+      mi_corrected |= mi_go_bits[i];
+      go_corrected = go_corrected << 1;
+      go_corrected |= mi_go_bits[i+12];
+      //manipulate for crc check
+      mi_bits[i+(j*12)] = mi_go_bits[i];
+    }
+  }
+
+  int mi_final = 0; 
+  mi_final = (mi_corrected >> 4) & 0xFFFFFFFF;
+
+  mi_crc_ext = (uint8_t)ConvertBitIntoBytes(&mi_bits[32], 4);
+  mi_crc_cmp = crc4(mi_bits, 32);
+  if (mi_crc_ext == mi_crc_cmp)
+    mi_crc_ok = 1;
+
+  //debug -- working now
+  // fprintf (stderr, " LE MI: %09llX; CRC EXT: %X; CRC CMP: %X; \n", mi_corrected, mi_crc_ext, mi_crc_cmp);
+
+  if (g[0] && g[1] && g[2])
+  {
+    if (slot == 0 && state->payload_algid != 0)
+    {
+      if (state->payload_mi != mi_final) 
+      {
+        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;
+        if (mi_crc_ok == 1) fprintf (stderr, "(CRC OK)");
+        else fprintf (stderr, "(CRC ERR)");
+        fprintf (stderr, "\n");
+        fprintf (stderr, "%s", KNRM);
+      }
+      //run afterwards, or le verification won't match up properly
+      if (state->payload_algid != 0x21)
+      {
+        LFSR64 (state);
+        fprintf (stderr, "\n");
+      } 
+    }
+    if (slot == 1 && state->payload_algidR != 0)
+    {
+      if (state->payload_miR != mi_final)
+      {
+        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;
+        if (mi_crc_ok == 1) fprintf (stderr, "(CRC OK)");
+        else fprintf (stderr, "(CRC ERR)");
+        fprintf (stderr, "\n");
+        fprintf (stderr, "%s", KNRM);
+      }
+      //run afterwards, or le verification won't match up properly
+      if (state->payload_algidR != 0x21)
+      {
+        LFSR64 (state);
+        fprintf (stderr, "\n");
+      } 
+    }
+
+  }
+
+}
+
+void dmr_alg_refresh (dsd_opts * opts, dsd_state * state)
+{
+  UNUSED(opts);
+
+  if (state->currentslot == 0)
+  {
+    state->dropL = 256;
+
+    if (state->K1 != 0) 
+    {
+      state->DMRvcL = 0;
+    }
+
+    if (state->payload_algid == 0x21)
+    {
+      LFSR (state);
+      fprintf (stderr, "\n");
+    }
+    //LFSR64 carried out after LE verification in order to keep it from constantly resetting the MI to the previous value
+
+  }
+  if (state->currentslot == 1)
+  {
+    state->dropR = 256;
+
+    if (state->K1 != 0) 
+    {
+      state->DMRvcR = 0;
+    }
+
+    if (state->payload_algidR == 0x21)
+    {
+      LFSR (state);
+      fprintf (stderr, "\n");
+    }
+    //LFSR64 carried out after LE verification in order to keep it from constantly resetting the MI to the previous value
+
+  }
+
+}
+
+void dmr_alg_reset (dsd_opts * opts, dsd_state * state)
+{
+  UNUSED(opts);
+
+  state->dropL = 256;
+  state->dropR = 256;
+  state->DMRvcL = 0;
+  state->DMRvcR = 0; 
+  state->payload_miP = 0;
+  state->payload_miN = 0; 
+}
+
+//handle Single Burst (Voice Burst F) or Reverse Channel Signalling 
+void dmr_sbrc (dsd_opts * opts, dsd_state * state, uint8_t power)
+{
+  int i;
+  uint8_t slot = state->currentslot;
+  uint8_t sbrc_interleaved[32];
+  uint8_t sbrc_return[32];
+  uint8_t sbrc_retcrc[32]; //crc significant bits of the return for SB
+  memset (sbrc_interleaved, 0, sizeof(sbrc_interleaved));
+  memset (sbrc_return, 0, sizeof(sbrc_return));
+  memset (sbrc_retcrc, 0, sizeof(sbrc_retcrc));
+  uint32_t irr_err = 0;
+  uint32_t sbrc_hex = 0;
+  uint16_t crc_extracted = 7777;
+  uint16_t crc_computed = 9999;
+  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
+
+  //check to see if this a TXI system
+  if (slot == 0 && state->dmr_so & 0x20)  txi = 1;
+  if (slot == 1 && state->dmr_soR & 0x20) txi = 1;
+
+  // 9.3.2 Pre-emption and power control Indicator (PI)
+  // 0 - The embedded signalling carries information associated to the same logical channel or the Null embedded message
+  // 1 - The embedded signalling carries RC information associated to the other logical channel
+
+  for(i = 0; i < 32; i++) sbrc_interleaved[i] = state->dmr_embedded_signalling[slot][5][i + 8];
+  //power == 0 should be single burst
+  if (power == 0) irr_err = BPTC_16x2_Extract_Data(sbrc_interleaved, sbrc_return, 0);
+  //power == 1 should be reverse channel -- still need to check the interleave inside of BPTC
+  if (power == 1) irr_err = BPTC_16x2_Extract_Data(sbrc_interleaved, sbrc_return, 1);
+  //bad emb burst, never set a valid power indicator value (probably 9)
+  if (power > 1) goto SBRC_END;
+
+  //arrange the return for proper order for the crc3 check
+  for (i = 0; i < 8; i++) sbrc_retcrc[i] = sbrc_return[i+3];
+
+  //RC Channel CRC 7 Mask = 0x7A; CRC bits are used as privacy indicators on 
+  //Single Voice Burst F (see below), other moto values seem to exist there as well -- See TXI patent
+  if (power == 1) //RC
+  {
+    crc_extracted = 0;
+    for (i = 0; i < 7; i++)
+    {
+      crc_extracted = crc_extracted << 1;
+      crc_extracted = crc_extracted | sbrc_return[i+4];
+    }
+    crc_extracted = crc_extracted ^ 0x7A;
+    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
+  {
+    crc_extracted = 0;
+    for (i = 0; i < 3; i++)
+    {
+      crc_extracted = crc_extracted << 1;
+      crc_extracted = crc_extracted | sbrc_return[i]; //first 3 most significant bits
+    }
+    crc_computed = crc3((uint8_t *) sbrc_retcrc, 8); //working now seems consistent as well 
+    if (crc_extracted == crc_computed) crc3_okay = 1;
+    // fprintf (stderr, " CRC EXT %02X, CRC CMP %02X", crc_extracted, crc_computed);
+  }
+  // else //crc_okay = 0; //CRC invalid / not available when is ENC Identifiers (I really hate that)
+
+  for(i = 0; i < 11; i++)
+  {
+    sbrc_hex = sbrc_hex << 1;
+    sbrc_hex |= sbrc_return[i] & 1;
+  }
+
+  if (opts->payload == 1) //hide the sb/rc behind the payload printer, won't be useful to most people
+  {
+    fprintf (stderr, "%s", KCYN);
+    if (power == 0) fprintf (stderr, " SB: ");
+    if (power == 1) fprintf (stderr, " RC: ");
+    for(i = 0; i < 11; i++)
+      fprintf (stderr, "%d", sbrc_return[i]);
+    fprintf (stderr, " - %03X; ", sbrc_hex);
+    fprintf (stderr, "%s", KNRM);
+    
+    // if (crc_okay == 0) //forego this since the crc can vary or not be used at all
+    // {
+    //   fprintf (stderr, "%s", KRED);
+    //   fprintf (stderr, " (CRC ERR)");
+    //   fprintf (stderr, "%s", KNRM);
+    //   fprintf (stderr, " CRC EXT %02X, CRC CMP %02X", crc_extracted, crc_computed);
+    // }
+
+    fprintf (stderr, "\n");
+  }
+  
+  uint8_t sbrc_opcode = sbrc_hex & 0x7; //opcode and alg the same bits, but the alg is present when CRC is bad (I know they are limited on bits, but I hate that idea)
+  uint8_t alg = sbrc_hex & 0x7; //SEE: https://patents.google.com/patent/EP2347540B1/en
+  uint8_t key = (sbrc_hex >> 3) & 0xFF;
+  uint8_t txi_delay = (sbrc_hex >> 3) & 0x1F; //middle five are the 'delay' value on a TXI system
+
+  //Note: AES-256 Key 1 will pass a CRC3 due to its bit arrangement vs the CRC poly 1101
+  // if (irr_err == 0 && sbrc_hex = 0xD) crc3_okay = 0; //SB: 00000001101
+
+  //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 (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)
+    {
+      if (sbrc_hex == 0) ; //NULL, do nothing
+
+      //else if (placeholder for future conditions)
+      // {
+      //   placeholder for future conditions
+      // }
+
+      else if (crc7_okay == 1)
+      {
+        //do something with the reverse channel information
+      }
+
+      //if the call is interruptable (TXI) and the crc3 is okay and TXI Opcode
+      else if (crc3_okay == 1 && (sbrc_opcode == 0 || sbrc_opcode == 3) )
+      {
+        //opcodes -- 0 (NULL), BR Delay (3)
+        if (opts->payload == 0) fprintf (stderr, "\n");
+        fprintf (stderr, "%s", KCYN);
+        fprintf (stderr, " TXI Op: %X -", sbrc_opcode);
+        if      (sbrc_opcode == 0) fprintf (stderr, " Null; ");
+        else if (sbrc_opcode == 3) 
+        {
+          if (txi_delay != 0)
+            fprintf (stderr, " BR Delay: %d - %d ms;", txi_delay, txi_delay * 30); //could also indicate number of superframes until next VC6 pre-emption
+          else fprintf (stderr, "BR Delay: Irrelevant / Send at any time;");
+
+          //alignment of inbound backwards channel and outbound burst
+          if (txi_delay == 2) fprintf (stderr, " SF3, Burst E;"); //E is inbound
+          if (txi_delay == 4) fprintf (stderr, " SF3, Burst D;"); //D is inbound
+          if (txi_delay == 6) fprintf (stderr, " SF3, Burst C;"); //C is inbound
+          if (txi_delay == 8) fprintf (stderr, " SF3, Burst B;"); //B is inbound
+        }
+        else fprintf (stderr, " Unk; ");
+        fprintf (stderr, "%s", KNRM);
+
+        if (opts->payload == 1) fprintf (stderr, "\n"); //only during payload
+
+      }
+
+      else if (sbrc_opcode != 0 && sbrc_opcode != 3) //all that should be left in this field is the potential ENC identifiers
+      {
+
+        if (slot == 0) //may not need the state->errs anymore //&& state->errs < 3
+        {
+          if (state->dmr_so & 0x40 && key != 0 && alg != 0)
+          {
+            //if we aren't forcing a particular alg or privacy key set
+            if (state->M == 0)
+            {
+              fprintf (stderr, "\n");
+              fprintf (stderr, "%s", KCYN);
+              fprintf (stderr, " Slot 1");
+              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)
+            }
+
+          }
+        }
+
+        if (slot == 1) //may not need the state->errs anymore //&& state->errsR < 3
+        {
+          if (state->dmr_soR & 0x40 && key != 0 && alg != 0)
+          {
+            //if we aren't forcing a particular alg or privacy key set
+            if (state->M == 0)
+            {
+              fprintf (stderr, "\n");
+              fprintf (stderr, "%s", KCYN);
+              fprintf (stderr, " Slot 2");
+              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)
+            }
+
+          }
+        }
+
+      }
+
+    }
+  }
+
+  SBRC_END:
+
+  //'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 RC designation value
+    int k = 0;
+    for (i = 0; i < 24; i++) //12 bytes, SB or RC
+    {
+      //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);
+  } 
+
+}
+
+uint8_t crc3(uint8_t bits[], unsigned int len)
+{
+  uint8_t crc=0;
+  unsigned int K = 3;
+  //x^3+x+1 
+  uint8_t poly[4] = {1,1,0,1};
+  uint8_t buf[256];
+  if (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;
+}
+
+uint8_t crc4(uint8_t bits[], unsigned int len)
+{
+  uint8_t crc=0;
+  unsigned int K = 4;
+  //x^4+x+1 
+  uint8_t poly[5] = {1,0,0,1,1};
+  uint8_t buf[256];
+  if (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 ^ 0xF; //invert
+}

src/dmr_pdu.c

@@ -0,0 +1,542 @@
+/*-------------------------------------------------------------------------------
+ * dmr_bs.c
+ * DMR Data (1/2, 3/4, 1) PDU Decoding
+ *
+ * LWVMOBILE
+ * 2022-12 DSD-FME Florida Man Edition
+ *-----------------------------------------------------------------------------*/
+
+#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 slot = state->currentslot;
+
+  //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);
+  else dmr_lrrp (opts, state, block_len, DMR_PDU);
+
+  //maybe one day we will have more things to do here
+  state->data_conf_data[slot] = 0; //flag off confirmed data after processing it 
+  state->data_p_head[slot] = 0; //flag off prop_head data after processing it
+  
+}
+
+//The contents of this function are mostly my reversed engineered efforts by observing DSDPlus output and matching data bytes
+//combined with a few external sources such as OK-DMR for some token values and extra data values (rad and alt)
+//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;
+  uint16_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_confidence = 0; //variable to increment based on number of tokens found, the more, the higher the confidence level
+
+  //source/dest and ports
+  uint32_t source = 0;
+  uint32_t dest = 0;
+  uint16_t port_s = 0;
+  uint16_t port_d = 0;
+
+  //time
+  uint16_t year = 0;
+  uint16_t month = 0;
+  uint16_t day = 0;
+  uint16_t hour = 0;
+  uint16_t minute = 0;
+  uint16_t second = 0;
+
+  //lat-long-radius-alt
+  uint32_t lat = 0;
+  uint32_t lon = 0;
+  uint16_t rad = 0; //or Azimuth in Circle 3D?
+  uint8_t alt = 0;
+  double lat_unit = (double)180/(double)4294967295;
+  double lon_unit = (double)360/(double)4294967295;
+  double lat_fin = 0.0; //calculated values
+  double lon_fin = 0.0; //calculated values
+  int lat_sign = 1; //positive 1, or negative 1
+  int lon_sign = 1; //positive 1, or negative 1
+
+  //speed -- NOTE: Velocity is Speed + Direction
+  uint16_t vel = 0;
+  double velocity = 0;
+  uint8_t vel_set = 0;
+  UNUSED(vel);
+
+  //track, direction, degrees
+  uint8_t degrees = 0;
+  uint8_t deg_set = 0;
+
+  char deg_glyph[4];
+  sprintf (deg_glyph, "%s", "°");
+  // sprintf (deg_glyph, "%s", "d"); 
+
+  //triggered information report
+  uint8_t report = 0;
+  uint8_t pot_report = 0; //potential report by finding 0x0D and backtracking a few bytes
+
+
+  //start looking for tokens (using my best understanding of the ok-dmr library xml and python files)
+  for (i = 0; i < ( (blocks*block_len) - (padding+4) ); i++) 
+  {
+
+    switch(DMR_PDU[i]){
+      case 0x0C: //LRRP_TriggeredLocationReport
+        if (source == 0)
+        {
+          source = (DMR_PDU[i+1] << 16 ) + (DMR_PDU[i+2] << 8) + DMR_PDU[i+3];
+          dest = (DMR_PDU[i+5] << 16 ) + (DMR_PDU[i+6] << 8) + DMR_PDU[i+7];
+          port_s = (DMR_PDU[i+8] << 8) + DMR_PDU[i+9];
+          port_d = (DMR_PDU[i+10] << 8) + DMR_PDU[i+11];
+          i += 11;
+          lrrp_confidence++;
+        }
+        break;
+      //may need more 'report' types to trigger various scenarios
+      //disable all but 0x1F if issues or falsing happens often
+      //case 0x1D: //ARRP_TriggeredInformationAnswer_NCDT
+      //case 0x1E: //ARRP_TriggeredInformationReport = FALSE?
+      //case 0x25: //ARRP_UnsolicitedInformationReport_NCDT = (0x25, True, "")
+      //case 0x26: //ARRP_UnsolicitedInformationReport_NCDT
+      //case 0x13: //LRRP_UnsolicitedLocationReport_NCDT
+      //case 0x15: //LRRP_LocationProtocolReport_NCDT
+      //case 0x21: //ARRP_TriggeredInformationStopRequest_NCDT
+      case 0x1F: //ARRP_TriggeredInformationReport_NCDT
+        if (report == 0)
+        {
+          report = DMR_PDU[i];
+          i += 1; 
+          lrrp_confidence++;
+        }
+        break;
+      //0x0D always seems to follow 0x1F or other 'report' types two/three bytes later
+      case 0x0D: //message len indicator //LRRP_TriggeredLocationReport_NCDT
+        if (report > 0 && message_len == 0)
+        {
+          message_len = DMR_PDU[i+1]; 
+          i += 1;
+          lrrp_confidence++;
+        }
+        else if (message_len == 0)
+        {
+          if (i > 3)
+          {
+            if (DMR_PDU[i-3] > 0) pot_report = DMR_PDU[i-3];
+            if (pot_report < 0x27)
+            {
+              report = pot_report;
+              message_len = DMR_PDU[i+1]; 
+              i += 1;
+              //no lrrp_confidence on speculative reporting, but will print it as such.
+            }
+          } 
+          
+        }
+        break;
+      //RESULT TOKEN or Request ID!
+      case 0x22: //same comment as below, observed followed the message len
+      case 0x23: //this value has been seen after the 0x0D message len, appears to be a 2-byte value, was tripping a false on time stamp 
+        i += 2;
+        break; 
+      //answer and report tokens
+      case 0x51: //circle-2d
+      case 0x54: //circle-3d
+      case 0x55: //circle-3d 
+        if (message_len > 0 && lat == 0)
+        {
+          // lat = ( ( ((DMR_PDU[i+1] & 0x7F ) <<  24 ) + (DMR_PDU[i+2] << 16) + (DMR_PDU[i+3] << 8) + DMR_PDU[i+4]) * 1 );
+          // lon = ( ( ((DMR_PDU[i+5] & 0x7F ) <<  24 ) + (DMR_PDU[i+6] << 16) + (DMR_PDU[i+7] << 8) + DMR_PDU[i+8]) * 1 );
+          lat = ( ( (DMR_PDU[i+1]           <<  24 ) + (DMR_PDU[i+2] << 16) + (DMR_PDU[i+3] << 8) + DMR_PDU[i+4]) * 1 );
+          lon = ( ( (DMR_PDU[i+5]           <<  24 ) + (DMR_PDU[i+6] << 16) + (DMR_PDU[i+7] << 8) + DMR_PDU[i+8]) * 1 );
+          rad = (DMR_PDU[i+9] << 8) + DMR_PDU[i+10];
+          i += 10; 
+          if (lat > 0 && lon > 0) lrrp_confidence++; //would be better to set by absolute boundary (180 and 90?)
+          else lat = 0;
+        }
+        break;
+      
+      case 0x34: //Time Interval Periodic Trigger (timestamp)
+      case 0x35: //Time Interval Periodic Trigger (timestamp)
+        if (message_len > 0 && year == 0)
+        {
+          year = (DMR_PDU[i+1] << 6) + (DMR_PDU[i+2] >> 2);
+          month = ((DMR_PDU[i+2] & 0x3) << 2) + ((DMR_PDU[i+3] & 0xC0) >> 6);
+          day =  ((DMR_PDU[i+3] & 0x30) >> 1) + ((DMR_PDU[i+3] & 0x0E) >> 1);
+          hour = ((DMR_PDU[i+3] & 0x01) << 4) + ((DMR_PDU[i+4] & 0xF0) >> 4);
+          minute = ((DMR_PDU[i+4] & 0x0F) << 2) + ((DMR_PDU[i+5] & 0xC0) >> 6);
+          second = (DMR_PDU[i+5] & 0x3F);
+          i += 5; 
+          //sanity check
+          if (year > 2000 && year <= 2025) lrrp_confidence++;
+          if (year > 2025 || year < 2000) year = 0; //needs future proofing
+        }
+        break;
+      
+      case 0x66: //point-2d 
+        if (message_len > 0 && lat == 0)
+        {
+          // lat = ( ( ((DMR_PDU[i+1] & 0x7F ) <<  24 ) + (DMR_PDU[i+2] << 16) + (DMR_PDU[i+3] << 8) + DMR_PDU[i+4]) * 1 );
+          // lon = ( ( ((DMR_PDU[i+5] & 0x7F ) <<  24 ) + (DMR_PDU[i+6] << 16) + (DMR_PDU[i+7] << 8) + DMR_PDU[i+8]) * 1 );
+          lat = ( ( (DMR_PDU[i+1]           <<  24 ) + (DMR_PDU[i+2] << 16) + (DMR_PDU[i+3] << 8) + DMR_PDU[i+4]) * 1 );
+          lon = ( ( (DMR_PDU[i+5]           <<  24 ) + (DMR_PDU[i+6] << 16) + (DMR_PDU[i+7] << 8) + DMR_PDU[i+8]) * 1 );
+          i += 8; 
+          lrrp_confidence++;
+        }
+        break;
+      case 0x69: //point-3d
+      case 0x6A: //point-3d
+        if (message_len > 0 && lat == 0)
+        {
+          // lat = ( ( ((DMR_PDU[i+1] & 0x7F ) <<  24 ) + (DMR_PDU[i+2] << 16) + (DMR_PDU[i+3] << 8) + DMR_PDU[i+4]) * 1 );
+          // lon = ( ( ((DMR_PDU[i+5] & 0x7F ) <<  24 ) + (DMR_PDU[i+6] << 16) + (DMR_PDU[i+7] << 8) + DMR_PDU[i+8]) * 1 );
+          lat = ( ( (DMR_PDU[i+1]           <<  24 ) + (DMR_PDU[i+2] << 16) + (DMR_PDU[i+3] << 8) + DMR_PDU[i+4]) * 1 );
+          lon = ( ( (DMR_PDU[i+5]           <<  24 ) + (DMR_PDU[i+6] << 16) + (DMR_PDU[i+7] << 8) + DMR_PDU[i+8]) * 1 );
+          alt =  DMR_PDU[i+9];
+          i += 9; 
+          if (lat > 0 && lon > 0) lrrp_confidence++; 
+          else lat = 0;
+        }
+        break;
+      case 0x36: //protocol-version
+        i += 1;
+        //lrrp_confidence++;
+        break;
+      //speed/velocity
+      case 0x70: //speed-virt
+      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_set = 1;
+          i += 2;
+          lrrp_confidence++;
+        }
+        break;
+      case 0x56: //direction-hor
+        if (message_len > 0 && deg_set == 0)
+        {
+          degrees = DMR_PDU[i+1] * 2;
+          deg_set = 1;
+          i += 1;
+          lrrp_confidence++;
+        }
+        break;
+      //below all unknown  
+      case 0x37: //result
+      case 0x38: //result
+      case 0x39: //result 'operations error'? attributes 0x22?
+      case 0x6B: //unknown-uint8
+      case 0x65: //lev-conf
+      default:
+        //do nothing
+        break;
+    }
+  }
+  if (report && message_len > 0)
+  {
+    fprintf (stderr, "%s", KYEL);
+    fprintf (stderr, "\n LRRP Confidence: %d - Message Len: %d Octets", lrrp_confidence, message_len);
+    if (lrrp_confidence >= 3) //find the sweet magical number
+    {
+      //now we can open our lrrp file and write to it as well
+      FILE * pFile; //file pointer
+      if (opts->lrrp_file_output == 1)
+      {
+        //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", 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 (pot_report)
+      {
+        fprintf (stderr, "\n");
+        fprintf (stderr, "  Potential ARRP/LRRP Report (Debug): 0x%02X", report);
+      }
+      if (report)
+      {
+        fprintf (stderr, "\n");
+        fprintf (stderr, "  Report: 0x%02X", report);
+        if (report == 0x1F) fprintf (stderr, " ARRP_TriggeredInformationReport_NCDT "); //customize later when more is learned 
+        if (report == 0x21) fprintf (stderr, " ARRP_TriggeredInformationStopRequest_NCDT ");
+        if (report == 0x22) fprintf (stderr, " ARRP_TriggeredInformationStopAnswer ");
+        if (report == 0x25) fprintf (stderr, " ARRP_UnsolicitedInformationReport_NCDT ");
+        if (report == 0x26) fprintf (stderr, " ARRP_UnsolicitedInformationReport_NCDT ");
+        if (report == 0x27) fprintf (stderr, " ARRP_InformationProtocolRequest_NCDT ");
+        if (report == 0x13) fprintf (stderr, " LRRP_UnsolicitedLocationReport_NCDT ");
+        if (report == 0x15) fprintf (stderr, " LRRP_UnsolicitedLocationReport_NCDT ");
+
+      }
+      if (source)
+      {
+        fprintf (stderr, "\n");
+        fprintf (stderr, "       Source: %08d - %04d", source, port_s);
+        fprintf (stderr, "\n");
+        fprintf (stderr, "  Destination: %08d - %04d", dest, port_d);
+
+      }
+      if (year)
+      {
+        fprintf (stderr, "\n");
+        fprintf (stderr, "  LRRP - Time: ");
+        fprintf (stderr, " %04d.%02d.%02d %02d:%02d:%02d", year, month, day, hour, minute, second);
+
+      }
+      if (lat)
+      {
+        fprintf (stderr, "\n");
+        //need to check these new calcs for accuracy accross the globe, both lat and lon
+
+        //two's compliment-ish testing on these bytes
+        if (lat & 0x80000000) //8
+        {
+          lat = lat & 0x7FFFFFFF;
+          lat_sign = -1;
+          // lat = 0x80000000 - lat; //not sure why this doesn't work here like it does on lon, extra bit? 
+        } 
+        if (lon & 0x80000000)
+        {
+          lon = lon & 0x7FFFFFFF;
+          lon_sign = -1;
+          lon = 0x80000000 - lon;
+        } 
+
+        lat_fin = (double)lat * lat_unit * lat_sign;
+        lon_fin = (double)lon * lon_unit * lon_sign;
+
+        fprintf (stderr, "  LRRP - Lat: %.5lf", lat_fin);
+        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);
+        // }
+
+      }
+       //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)
+      {
+        fprintf (stderr, "\n");
+        fprintf (stderr, "  LRRP - Radius: %dm", rad); //unsure of 'units' or calculation for radius (meters?)
+      }
+      if (alt)
+      {
+        fprintf (stderr, "\n");
+        fprintf (stderr, "  LRRP - Altitude: %dm", alt); //unsure of 'units' or calculation for alt (meters?)
+      }
+      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) );
+      }
+      //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);
+      }
+      //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)
+      {
+        fprintf (pFile, "\n");
+        fclose (pFile);
+      }
+
+      //save to string for ncurses
+      if (!source) source = state->dmr_lrrp_source[state->currentslot];
+      char velstr[20];
+      char degstr[20];
+      char lrrpstr[100];
+      sprintf (lrrpstr, "%s", "");
+      sprintf (velstr, "%s", "");
+      sprintf (degstr, "%s", "");
+      if (lat) sprintf (lrrpstr, "LRRP %0d (%lf, %lf)", source, lat_fin, lon_fin);
+      if (vel_set) sprintf (velstr, " %.4lf km/h", velocity * 3.6);
+      if (deg_set) sprintf (degstr, " %d%s  ", degrees, deg_glyph);
+      sprintf (state->dmr_lrrp_gps[slot], "%s%s%s", lrrpstr, velstr, degstr);
+      
+    }
+    
+  }
+  
+  else if (pot_report)
+  {
+    fprintf (stderr, "\n");
+    fprintf (stderr, "  Potential ARRP/LRRP Report (Debug): 0x%02X", report);
+  }
+
+  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;
+  uint8_t slot = state->currentslot;
+  uint8_t blocks = state->data_header_blocks[slot];
+  uint8_t padding = state->data_header_padding[slot];
+  uint8_t source = state->dmr_lrrp_source[slot];
+
+  //flags if certain data type is present
+  uint8_t time = 0;
+  uint8_t lat  = 0;
+  uint8_t lon  = 0;
+
+  //date-time variables
+  uint8_t hour = 0;
+  uint8_t minute = 0;
+  uint8_t second = 0;
+  uint8_t year = 0;
+  uint8_t month = 0;
+  uint8_t day = 0;
+
+  //need to experiment best way to do this portion
+  uint8_t  lat_deg = 0;
+  uint8_t  lat_min = 0;
+  uint16_t lat_sec = 0;
+
+  uint8_t  lon_deg = 0;
+  uint8_t  lon_min = 0;
+  uint16_t lon_sec = 0;
+
+  char lat_ord[2];
+  char lon_ord[2];
+  sprintf (lat_ord, "%s", "N");
+  sprintf (lon_ord, "%s", "E");
+
+  char deg_glyph[4];
+  sprintf (deg_glyph, "%s", "°");
+  // sprintf (deg_glyph, "%s", "d");
+
+  //more strings...
+  char locnstr[50];
+  char latstr[75];
+  char lonstr[75];
+  sprintf (locnstr, "%s", "     ");
+  sprintf (latstr, "%s", "     ");
+  sprintf (lonstr, "%s", "     ");
+
+  //TODO: conversion to decimal format
+  //DD = d + (min/60) + (sec/3600)
+  //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);
+
+  //start looking for specific bytes corresponding to 'letters' A (time), NSEW (ordinal directions), etc
+  for (i = 0; i < ( (blocks*block_len) - (padding+4) ); i++)
+  {
+    switch(DMR_PDU[i]){
+      case 0x41: //A -- time and date
+        time   = 1;
+        hour   = ((DMR_PDU[i+1] - 0x30) << 4) | (DMR_PDU[i+2] - 0x30);
+        minute = ((DMR_PDU[i+3] - 0x30) << 4) | (DMR_PDU[i+4] - 0x30);
+        second = ((DMR_PDU[i+5] - 0x30) << 4) | (DMR_PDU[i+6] - 0x30);
+        //think this is in day, mon, year format
+        day   = ((DMR_PDU[i+7] -  0x30) << 4) | (DMR_PDU[i+8] - 0x30);
+        month = ((DMR_PDU[i+9] -  0x30) << 4) | (DMR_PDU[i+10] - 0x30);
+        year  = ((DMR_PDU[i+11] - 0x30) << 4) | (DMR_PDU[i+12] - 0x30);
+        i += 12; 
+        break;
+      
+      case 0x53: //S -- South
+        sprintf (lat_ord, "%s", "S");
+        lat_sign = -1;
+      case 0x4E: //N -- North
+        lat     = 1;
+        lat_deg = ((DMR_PDU[i+1] - 0x30) << 4) | (DMR_PDU[i+2] - 0x30);
+        lat_min = ((DMR_PDU[i+3] - 0x30) << 4) | (DMR_PDU[i+4] - 0x30);
+        lat_sec = ((DMR_PDU[i+6] - 0x30) << 12) | ((DMR_PDU[i+7] - 0x30) << 8) | ((DMR_PDU[i+8] - 0x30) << 4) | ((DMR_PDU[i+9] - 0x30) << 0);
+        i += 8;
+        break;
+      
+      case 0x57: //W -- West
+        sprintf (lon_ord, "%s", "W");
+        lon_sign = -1;
+      case 0x45: //E -- East
+        lon     = 1; 
+        lon_deg = ((DMR_PDU[i+1] - 0x30) << 8) | ((DMR_PDU[i+2] - 0x30) << 4) | ((DMR_PDU[i+3] - 0x30) << 0);
+        lon_min = ((DMR_PDU[i+4] - 0x30) << 4) | (DMR_PDU[i+5] - 0x30);
+        lon_sec = ((DMR_PDU[i+7] - 0x30) << 12) | ((DMR_PDU[i+8] - 0x30) << 8) | ((DMR_PDU[i+9] - 0x30) << 4) | ((DMR_PDU[i+10] - 0x30) << 0);
+        i += 8;
+        break;
+
+      default:
+        //do nothing
+        break;
+
+    } //end switch
+
+  } //for i 
+
+  if (lat && lon)
+  {
+    fprintf (stderr, "%s", KYEL);
+    fprintf (stderr, "\n LOCN Report - Source: [%d]\n", source);
+    if (time) fprintf (stderr, "  20%02X/%02X/%02X %02X:%02X:%02X ", year, month, day, hour, minute, second);
+    fprintf (stderr, "Lat: %s %02X%s%02X\"%04X' Lon: %s %02X%s%02X\"%04X' ", lat_ord, lat_deg, deg_glyph, lat_min, lat_sec, lon_ord, lon_deg, deg_glyph, lon_min, lon_sec);
+
+    //string manip for ncurses terminal display
+    sprintf (locnstr, "LOCN %d ", source);
+    sprintf (latstr, "%s %02X%s%02X\"%04X' ", lat_ord, lat_deg, deg_glyph, lat_min, lat_sec);
+    sprintf (lonstr, "%s %02X%s%02X\"%04X' ", lon_ord, lon_deg, deg_glyph, lon_min, lon_sec);
+    sprintf (state->dmr_lrrp_gps[slot], "%s%s%s", locnstr, latstr, lonstr);
+
+  } 
+
+}

src/dmr_pi.c

@@ -0,0 +1,173 @@
+/*-------------------------------------------------------------------------------
+ * dmr_pi.c
+ * DMR Privacy Indicator and LFSR Function
+ *
+ * LFSR code courtesy of https://github.com/mattames/LFSR/
+ *
+ * LWVMOBILE
+ * 2022-12 DSD-FME Florida Man Edition
+ *-----------------------------------------------------------------------------*/
+ 
+#include "dsd.h"
+
+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)) 
+  {
+
+    if (state->currentslot == 0)
+    {
+      state->payload_algid = PI_BYTE[0];
+      state->payload_keyid = PI_BYTE[2];
+      state->payload_mi    = ( ((PI_BYTE[3]) << 24) + ((PI_BYTE[4]) << 16) + ((PI_BYTE[5]) << 8) + (PI_BYTE[6]) );
+      if (state->payload_algid < 0x26) 
+      {
+        fprintf (stderr, "%s ", KYEL);
+        fprintf (stderr, "\n Slot 1");
+        fprintf (stderr, " DMR PI H- ALG ID: 0x%02X KEY ID: 0x%02X MI: 0x%08X", state->payload_algid, state->payload_keyid, state->payload_mi);
+
+        //Anytone RC4 Shim
+        if (state->payload_algid == 0x01)
+        {
+          fprintf (stderr, " Anytone (0x01)");
+          state->payload_algid = 0x21;
+        }
+
+        fprintf (stderr, "%s ", KNRM);
+        if (state->payload_algid != 0x21)
+        {
+          fprintf (stderr, "\n");
+          LFSR64 (state);
+        } 
+      }
+
+      if (state->payload_algid >= 0x26)
+      {
+        state->payload_algid = 0;
+        state->payload_keyid = 0;
+        state->payload_mi = 0;
+      }
+    }
+
+    if (state->currentslot == 1)
+    {
+
+      state->payload_algidR = PI_BYTE[0];
+      state->payload_keyidR = PI_BYTE[2];
+      state->payload_miR    = ( ((PI_BYTE[3]) << 24) + ((PI_BYTE[4]) << 16) + ((PI_BYTE[5]) << 8) + (PI_BYTE[6]) );
+      if (state->payload_algidR < 0x26) 
+      {
+        fprintf (stderr, "%s ", KYEL);
+        fprintf (stderr, "\n Slot 2");
+        fprintf (stderr, " DMR PI H- ALG ID: 0x%02X KEY ID: 0x%02X MI: 0x%08X", state->payload_algidR, state->payload_keyidR, state->payload_miR);
+
+        //Anytone RC4 Shim
+        if (state->payload_algidR == 0x01)
+        {
+          fprintf (stderr, " Anytone (0x01)");
+          state->payload_algidR = 0x21;
+        }
+
+        fprintf (stderr, "%s ", KNRM);
+        if (state->payload_algidR != 0x21)
+        {
+          fprintf (stderr, "\n");
+          LFSR64 (state);
+        } 
+      }
+
+      if (state->payload_algidR >= 0x26)
+      {
+        state->payload_algidR = 0;
+        state->payload_keyidR = 0;
+        state->payload_miR = 0;
+      }
+
+    }
+
+  }
+}
+
+void LFSR(dsd_state * state)
+{
+  int lfsr = 0;
+  if (state->currentslot == 0)
+  {
+    lfsr = state->payload_mi;
+  }
+  else lfsr = state->payload_miR;
+
+  uint8_t cnt = 0;
+
+  for(cnt=0;cnt<32;cnt++)
+  {
+	  // Polynomial is C(x) = x^32 + x^4 + x^2 + 1
+    int bit  = ((lfsr >> 31) ^ (lfsr >> 3) ^ (lfsr >> 1)) & 0x1;
+    lfsr =  (lfsr << 1) | (bit);
+  }
+
+  if (state->currentslot == 0)
+  {
+    fprintf (stderr, "%s", KYEL);
+    fprintf (stderr, " Slot 1");
+    fprintf (stderr, " DMR PI C- ALG ID: 0x%02X KEY ID: 0x%02X", state->payload_algid, state->payload_keyid);
+    fprintf(stderr, " MI: 0x%08X", lfsr);
+    fprintf (stderr, "%s", KNRM);
+    state->payload_mi = lfsr;
+  }
+
+  if (state->currentslot == 1) 
+  {
+
+    fprintf (stderr, "%s", KYEL);
+    fprintf (stderr, " Slot 2");
+    fprintf (stderr, " DMR PI C- ALG ID: 0x%02X KEY ID: 0x%02X", state->payload_algidR, state->payload_keyidR);
+    fprintf(stderr, " MI: 0x%08X", lfsr);
+    fprintf (stderr, "%s", KNRM);
+    state->payload_miR = lfsr;
+  }
+}
+
+void LFSR64(dsd_state * state)
+{
+	{
+    unsigned long long int lfsr = 0;
+
+		if (state->currentslot == 0)
+		{
+			lfsr = (uint64_t) state->payload_mi; 
+		}
+    else lfsr = (uint64_t) state->payload_miR; 
+
+    uint8_t cnt = 0;
+
+    for(cnt=0;cnt<32;cnt++) 
+    {
+			unsigned long long int bit = ( (lfsr >> 31) ^ (lfsr >> 21) ^ (lfsr >> 1) ^ (lfsr >> 0) ) & 0x1;
+      lfsr = (lfsr << 1) | bit;
+    }
+
+		if (state->currentslot == 0)
+		{
+      fprintf (stderr, "%s", KYEL);
+      fprintf (stderr, " Slot 1");
+      fprintf (stderr, " DMR PI C- ALG ID: 0x%02X KEY ID: 0x%02X", state->payload_algid, state->payload_keyid);
+      fprintf (stderr, " MI: 0x%016llX", lfsr);
+      fprintf (stderr, "%s", KNRM);
+			state->payload_mi = lfsr & 0xFFFFFFFF; //truncate for next repitition and le verification
+		}
+
+		if (state->currentslot == 1)
+		{
+      fprintf (stderr, "%s", KYEL);
+      fprintf (stderr, " Slot 2");
+      fprintf (stderr, " DMR PI C- ALG ID: 0x%02X KEY ID: 0x%02X", state->payload_algidR, state->payload_keyidR);
+      fprintf (stderr, " MI: 0x%016llX", lfsr);
+      fprintf (stderr, "%s", KNRM);
+			state->payload_miR = lfsr & 0xFFFFFFFF; //truncate for next repitition and le verification
+		}
+
+	}
+}

src/dmr_process_voice.c

@@ -1,395 +0,0 @@
-/*
- * 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.
- */
-
-#include "dsd.h"
-#include "dmr_const.h"
-#include "p25p1_check_hdu.h"
-
-void ProcessDMR (dsd_opts * opts, dsd_state * state)
-{
-  uint32_t i, j;
-  uint32_t Frame;
-  TimeSlotVoiceSuperFrame_t * TSVoiceSupFrameL = NULL;
-  TimeSlotVoiceSuperFrame_t * TSVoiceSupFrameR = NULL;
-  TimeSlotVoiceSuperFrame_t * TSVoiceSupFrameRC = NULL; //Reverse Test for MS Backwards
-
-  int *errs;
-  int *errs2;
-  unsigned long long int k;
-  int x;
-  k = 0;
-
-  TSVoiceSupFrameL = &state->TS1SuperFrame;
-  TSVoiceSupFrameR = &state->TS2SuperFrame;
-
-int Pr[256] = {
-  0x0000, 0x1F00, 0xE300, 0xFC00, 0x2503, 0x3A03, 0xC603, 0xD903,
-  0x4A05, 0x5505, 0xA905, 0xB605, 0x6F06, 0x7006, 0x8C06, 0x9306,
-  0x2618, 0x3918, 0xC518, 0xDA18, 0x031B, 0x1C1B, 0xE01B, 0xFF1B,
-  0x6C1D, 0x731D, 0x8F1D, 0x901D, 0x491E, 0x561E, 0xAA1E, 0xB51E, //31
-  0x4B28, 0x5428, 0xA828, 0xB728, 0x6E2B, 0x712B, 0x8D2B, 0x922B,
-  0x012D, 0x1E2D, 0xE22D, 0xFD2D, 0x242E, 0x3B2E, 0xC72E, 0xD82E,
-  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, 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,
-  0x2A64, 0x3564, 0xC964, 0xD664, 0x0F67, 0x1067, 0xEC67, 0xF367,
-  0x4679, 0x5979, 0xA579, 0xBA79, 0x637A, 0x7C7A, 0x807A, 0x9F7A,
-  0x0C7C, 0x137C, 0xEF7C, 0xF07C, 0x297F, 0x367F, 0xCA7F, 0xD57F, //127
-  0x4D89, 0x5289, 0xAE89, 0xB189, 0x688A, 0x778A, 0x8B8A, 0x948A,
-  0x078C, 0x188C, 0xE48C, 0xFB8C, 0x228F, 0x3D8F, 0xC18F, 0xDE8F,
-  0x6B91, 0x7491, 0x8891, 0x9791, 0x4E92, 0x5192, 0xAD92, 0xB292,
-  0x2194, 0x3E94, 0xC294, 0xDD94, 0x0497, 0x1B97, 0xE797, 0xF897, //159
-  0x06A1, 0x19A1, 0xE5A1, 0xFAA1, 0x23A2, 0x3CA2, 0xC0A2, 0xDFA2,
-  0x4CA4, 0x53A4, 0xAFA4, 0xB0A4, 0x69A7, 0x76A7, 0x8AA7, 0x95A7,
-  0x20B9, 0x3FB9, 0xC3B9, 0xDCB9, 0x05BA, 0x1ABA, 0xE6BA, 0xF9BA,
-  0x6ABC, 0x75BC, 0x89BC, 0x96BC, 0x4FBF, 0x50BF, 0xACBF, 0xB3BF, //191
-  0x66C0, 0x79C0, 0x85C0, 0x9AC0, 0x43C3, 0x5CC3, 0xA0C3, 0xBFC3,
-  0x2CC5, 0x33C5, 0xCFC5, 0xD0C5, 0x09C6, 0x16C6, 0xEAC6, 0xF5C6,
-  0x84D0, 0x85DF, 0x8AD3, 0x8BDC, 0xB6D5, 0xB7DA, 0xB8D6, 0xB9D9,
-  0xD0DA, 0xD1D5, 0xDED9, 0xDFD6, 0xE2DF, 0xE3D0, 0xECDC, 0xEDD3, //223
-  0x2DE8, 0x32E8, 0xCEE8, 0xD1E8, 0x08EB, 0x17EB, 0xEBEB, 0xF4EB,
-  0x67ED, 0x78ED, 0x84ED, 0x9BED, 0x42EE, 0x5DEE, 0xA1EE, 0xBEEE,
-  0x0BF0, 0x14F0, 0xE8F0, 0xF7F0, 0x2EF3, 0x31F3, 0xCDF3, 0xD2F3,
-  0x41F5, 0x5EF5, 0xA2F5, 0xBDF5, 0x64F6, 0x7BF6, 0x87F6, 0x98F6 //255
-};
-
-
-if ( (state->currentslot == 0 && state->K > 0 && state->dmr_so & 0x40 && state->payload_keyid == 0 && state->dmr_fid == 0x10) ||
-      (state->currentslot == 0 && state->K > 0 && state->M == 1) )
-{
-  fprintf (stderr, "%s", KYEL);
-  fprintf(stderr, " PrK %lld", state->K);
-  fprintf (stderr, "%s", KNRM);
-  k = Pr[state->K];
-  k = ( ((k & 0xFF0F) << 32 ) + (k << 16) + k );
-
-  for(Frame = 0; Frame < 6; Frame++)
-  {
-   for(i = 0; i < 3; i++)
-   {
-     for(j = 0; j < 48; j++)
-     {
-      x = ( ((k << j) & 0x800000000000) >> 47 );
-      TSVoiceSupFrameL->TimeSlotAmbeVoiceFrame[Frame].AmbeBit[i][j] ^= x;
-     }
-   }
-  }
-}
-
-if ( (state->currentslot == 1 && state->K > 0 && state->dmr_soR & 0x40 && state->payload_keyidR == 0 && state->dmr_fidR == 0x10) ||
-      (state->currentslot == 1 && state->K > 0 && state->M == 1) )
-{
-  fprintf (stderr, "%s", KYEL);
-  fprintf(stderr, " PrK %lld", state->K);
-  fprintf (stderr, "%s", KNRM);
-  k = Pr[state->K];
-  k = ( ((k & 0xFF0F) << 32 ) + (k << 16) + k );
-
-  for(Frame = 0; Frame < 6; Frame++)
-  {
-   for(i = 0; i < 3; i++)
-   {
-     for(j = 0; j < 48; j++)
-     {
-      x = ( ((k << j) & 0x800000000000) >> 47 );
-      TSVoiceSupFrameR->TimeSlotAmbeVoiceFrame[Frame].AmbeBit[i][j] ^= x;
-     }
-   }
-  }
-}
-
-if ( (state->currentslot == 0 && state->K1 > 0 && state->dmr_so & 0x40 && state->payload_keyid == 0 && state->dmr_fid == 0x68) ||
-      (state->currentslot == 0 && state->K1 > 0 && state->M == 1) )
-{
-
-	int pos = 0;
-
-	unsigned long long int k1 = state->K1;
-	unsigned long long int k2 = state->K2;
-	unsigned long long int k3 = state->K3;
-	unsigned long long int k4 = state->K4;
-
-	fprintf (stderr, "\n");
-	fprintf (stderr, "%s", KYEL);
-	fprintf(stderr, " SPT %010llX", k1);
-
-	int T_Key[256] = {0};
-	int pN[882] = {0};
-
-	int len = 0;
-
-	if (k2 == 0)
-	{
-		len = 39;
-		k1 = k1 << 24;
-	}
-	if (k2 != 0)
-	{
-		len = 127;
-		fprintf(stderr, " %016llX", k2);
-	}
-	if (k4 != 0)
-	{
-		len = 255;
-		fprintf(stderr, " %016llX", k3);
-		fprintf(stderr, " %016llX", k4);
-	}
-
-	fprintf (stderr, "%s", KNRM);
-
-	for (i = 0; i < 64; i++)
-	{
-		T_Key[i]     = ( ((k1 << i) & 0x8000000000000000) >> 63 );
-		T_Key[i+64]  = ( ((k2 << i) & 0x8000000000000000) >> 63 );
-		T_Key[i+128] = ( ((k3 << i) & 0x8000000000000000) >> 63 );
-		T_Key[i+192] = ( ((k4 << i) & 0x8000000000000000) >> 63 );
-	}
-
-	for (i = 0; i < 882; i++)
-	{
-		pN[i] = T_Key[pos];
-		pos++;
-		if (pos > len)
-		{
-			pos = 0;
-		}
-	}
-
-	pos = 0;
-	for(Frame = 0; Frame < 6; Frame++)
-  {
-   for(i = 0; i < 3; i++)
-   {
-     for(j = 0; j < 49; j++)
-     {
-      TSVoiceSupFrameL->TimeSlotAmbeVoiceFrame[Frame].AmbeBit[i][j] ^= pN[pos];
-			pos++;
-		 }
-   }
-
-  }
-
-}
-
-if ( (state->currentslot == 1 && state->K1 > 0 && state->dmr_soR & 0x40 && state->payload_keyidR == 0 && state->dmr_fidR == 0x68) ||
-      (state->currentslot == 1 && state->K1 > 0 && state->M == 1) )
-{
-
-	int pos = 0;
-
-	unsigned long long int k1 = state->K1;
-	unsigned long long int k2 = state->K2;
-	unsigned long long int k3 = state->K3;
-	unsigned long long int k4 = state->K4;
-
-	fprintf (stderr, "\n");
-	fprintf (stderr, "%s", KYEL);
-	fprintf(stderr, " SPT %010llX", k1);
-
-	int T_Key[256] = {0};
-	int pN[882] = {0};
-
-	int len = 0;
-
-	if (k2 == 0)
-	{
-		len = 39;
-		k1 = k1 << 24;
-	}
-	if (k2 != 0)
-	{
-		len = 127;
-		fprintf(stderr, " %016llX", k2);
-	}
-	if (k4 != 0)
-	{
-		len = 255;
-		fprintf(stderr, " %016llX", k3);
-		fprintf(stderr, " %016llX", k4);
-	}
-
-	fprintf (stderr, "%s", KNRM);
-
-	for (i = 0; i < 64; i++)
-	{
-		T_Key[i]     = ( ((k1 << i) & 0x8000000000000000) >> 63 );
-		T_Key[i+64]  = ( ((k2 << i) & 0x8000000000000000) >> 63 );
-		T_Key[i+128] = ( ((k3 << i) & 0x8000000000000000) >> 63 );
-		T_Key[i+192] = ( ((k4 << i) & 0x8000000000000000) >> 63 );
-	}
-
-	for (i = 0; i < 882; i++)
-	{
-		pN[i] = T_Key[pos];
-		pos++;
-		if (pos > len)
-		{
-			pos = 0;
-		}
-	}
-
-	pos = 0;
-	for(Frame = 0; Frame < 6; Frame++)
-  {
-   for(i = 0; i < 3; i++)
-   {
-     for(j = 0; j < 49; j++)
-     {
-      TSVoiceSupFrameR->TimeSlotAmbeVoiceFrame[Frame].AmbeBit[i][j] ^= pN[pos];
-			pos++;
-		 }
-   }
-
-  }
-
-}
-
-if (state->currentslot == 0)
-{
-
-  for(Frame = 0; Frame < 6; Frame++) //6
-  {
-    /* 1 DMR frame contains 3 AMBE voice samples */
-    for(i = 0; i < 3; i++)
-    {
-      errs  = (int*)&(TSVoiceSupFrameL->TimeSlotAmbeVoiceFrame[Frame].errs1[i]);
-      errs2 = (int*)&(TSVoiceSupFrameL->TimeSlotAmbeVoiceFrame[Frame].errs2[i]);
-      state->errs =  TSVoiceSupFrameL->TimeSlotAmbeVoiceFrame[Frame].errs1[i]; //correct placement
-      state->errs2 = TSVoiceSupFrameL->TimeSlotAmbeVoiceFrame[Frame].errs2[i]; //correct placement
-
-      mbe_processAmbe2450Dataf (state->audio_out_temp_buf, errs, errs2, state->err_str,
-                                TSVoiceSupFrameL->TimeSlotAmbeVoiceFrame[Frame].AmbeBit[i],
-                                state->cur_mp, state->prev_mp, state->prev_mp_enhanced, opts->uvquality);
-
-      if (opts->payload == 1)
-      {
-        PrintAMBEData(opts, state, TSVoiceSupFrameL->TimeSlotAmbeVoiceFrame[Frame].AmbeBit[i]);
-      }
-
-      //quick enc toggle to determine whether or not to play enc traffic
-      int enc_bit = 0;
-      enc_bit = (state->dmr_so >> 6) & 0x1;
-      if (enc_bit == 1)
-      {
-        state->dmr_encL = 1;
-      }
-      else state->dmr_encL = 0;
-
-      if (state->K != 0 || state->K1 != 0)
-			{
-				state->dmr_encL = 0;
-			}
-
-      //quick test to determine whether or not to run the next few steps below
-      if (state->dmr_encL == 0 || opts->dmr_mute_encL == 0)
-      {
-        if (opts->mbe_out_f != NULL)
-        {
-          saveAmbe2450Data (opts, state, TSVoiceSupFrameL->TimeSlotAmbeVoiceFrame[Frame].AmbeBit[i]);
-        }
-
-        state->debug_audio_errors += *errs2;
-
-        processAudio(opts, state);
-
-        if (opts->wav_out_f != NULL)
-        {
-          writeSynthesizedVoice (opts, state);
-        }
-
-        if (opts->audio_out == 1) //opts->audio_out == 1
-        {
-          playSynthesizedVoice (opts, state);
-        }
-      } //second bracket for the test enc condition
-    } /* End for(i = 0; i < 3; i++) */
-  } /* End for(Frame = 0; Frame < 6; Frame++) */
- } //End if Current Slot == 0
-
- if (state->currentslot == 1)
- {
-
-   for(Frame = 0; Frame < 6; Frame++)
-   {
-     /* 1 DMR frame contains 3 AMBE voice samples */
-     for(i = 0; i < 3; i++)
-     {
-       errs  = (int*)&(TSVoiceSupFrameR->TimeSlotAmbeVoiceFrame[Frame].errs1[i]);
-       errs2 = (int*)&(TSVoiceSupFrameR->TimeSlotAmbeVoiceFrame[Frame].errs2[i]);
-       state->errs =  TSVoiceSupFrameR->TimeSlotAmbeVoiceFrame[Frame].errs1[i]; //correct placement
-       state->errs2 = TSVoiceSupFrameR->TimeSlotAmbeVoiceFrame[Frame].errs2[i]; //correct placement
-
-       mbe_processAmbe2450Dataf (state->audio_out_temp_buf, errs, errs2, state->err_str,
-                                 TSVoiceSupFrameR->TimeSlotAmbeVoiceFrame[Frame].AmbeBit[i],
-                                 state->cur_mp, state->prev_mp, state->prev_mp_enhanced, opts->uvquality);
-
-
-       if (opts->payload == 1)
-       {
-         PrintAMBEData(opts, state, TSVoiceSupFrameR->TimeSlotAmbeVoiceFrame[Frame].AmbeBit[i]);
-       }
-
-       //quick enc toggle to determine whether or not to play enc traffic
-       int enc_bit = 0;
-       enc_bit = (state->dmr_soR >> 6) & 0x1;
-       if (enc_bit == 1)
-       {
-         state->dmr_encR = 1;
-       }
-       else state->dmr_encR = 0;
-
-       if (state->K != 0 || state->K1 != 0)
- 			 {
- 				state->dmr_encR = 0;
- 			 }
-
-       //quick test to determine whether or not to run the next few steps below
-       if (state->dmr_encR == 0 || opts->dmr_mute_encR == 0)
-       {
-         if (opts->mbe_out_f != NULL)
-         {
-           saveAmbe2450Data (opts, state, TSVoiceSupFrameR->TimeSlotAmbeVoiceFrame[Frame].AmbeBit[i]);
-         }
-
-         state->debug_audio_errors += *errs2;
-
-         if (opts->audio_out == 1)
-         {
-            processAudio(opts, state);
-         }
-
-         if (opts->wav_out_f != NULL)
-         {
-           writeSynthesizedVoice (opts, state);
-         }
-
-         if (opts->audio_out == 1)
-         {
-           playSynthesizedVoice (opts, state);
-         }
-       }
-     } /* End for(i = 0; i < 3; i++) */
-   } /* End for(Frame = 0; Frame < 6; Frame++) */
- } //End if Current Slot == 1
-
-
-} /* End ProcessDMR */
-/* End of file */

src/dmr_utils.c

@@ -0,0 +1,440 @@
+//DMR CRC/Utility Functions
+//Original File - dmr_sync.c
+//ConvertBitIntoBytes, ComputeCrcCCITT, ComputeCrc5Bit, ComputeAndCorrectFullLinkControlCrc, CRC32, CRC9
+//Original Source - https://github.com/LouisErigHerve/dsd
+
+//Additional Functions
+//Hamming17123, crc7, crc8, crc8ok functions
+//Original Souce - https://github.com/boatbod/op25
+
+#include "dsd.h"
+
+//modified to accept variable payload size and len
+uint16_t ComputeCrcCCITT16d(const uint8_t buf[], uint8_t 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 ComputeCrcCCITTd() */
+
+// A Hamming (17,12,3) Check for completed SLC message
+bool Hamming17123(uint8_t* d)
+{
+
+	// Calculate the checksum this column should have
+	bool c0 = d[0] ^ d[1] ^ d[2] ^ d[3] ^ d[6] ^ d[7] ^ d[9];
+	bool c1 = d[0] ^ d[1] ^ d[2] ^ d[3] ^ d[4] ^ d[7] ^ d[8] ^ d[10];
+	bool c2 = d[1] ^ d[2] ^ d[3] ^ d[4] ^ d[5] ^ d[8] ^ d[9] ^ d[11];
+	bool c3 = d[0] ^ d[1] ^ d[4] ^ d[5] ^ d[7] ^ d[10];
+	bool c4 = d[0] ^ d[1] ^ d[2] ^ d[5] ^ d[6] ^ d[8] ^ d[11];
+
+	// Compare these with the actual bits
+	unsigned char n = 0x00U;
+	n |= (c0 != d[12]) ? 0x01U : 0x00U;
+	n |= (c1 != d[13]) ? 0x02U : 0x00U;
+	n |= (c2 != d[14]) ? 0x04U : 0x00U;
+	n |= (c3 != d[15]) ? 0x08U : 0x00U;
+	n |= (c4 != d[16]) ? 0x10U : 0x00U;
+
+	switch (n) {
+		// Parity bit errors
+		case 0x01U: d[12] = !d[12]; return true;
+		case 0x02U: d[13] = !d[13]; return true;
+		case 0x04U: d[14] = !d[14]; return true;
+		case 0x08U: d[15] = !d[15]; return true;
+		case 0x10U: d[16] = !d[16]; return true;
+
+		// Data bit errors
+		case 0x1BU: d[0]  = !d[0];  return true;
+		case 0x1FU: d[1]  = !d[1];  return true;
+		case 0x17U: d[2]  = !d[2];  return true;
+		case 0x07U: d[3]  = !d[3];  return true;
+		case 0x0EU: d[4]  = !d[4];  return true;
+		case 0x1CU: d[5]  = !d[5];  return true;
+		case 0x11U: d[6]  = !d[6];  return true;
+		case 0x0BU: d[7]  = !d[7];  return true;
+		case 0x16U: d[8]  = !d[8];  return true;
+		case 0x05U: d[9]  = !d[9];  return true;
+		case 0x0AU: d[10] = !d[10]; return true;
+		case 0x14U: d[11] = !d[11]; return true;
+
+		// No bit errors
+		case 0x00U: return true;
+
+		// Unrecoverable errors
+		default: return false;
+	}
+}
+
+uint8_t crc8(uint8_t bits[], unsigned int len)
+{
+	uint8_t crc=0;
+	unsigned int K = 8;
+	uint8_t poly[9] = {1,0,0,0,0,0,1,1,1}; // crc8 poly
+	uint8_t buf[256];
+	if (len+K > sizeof(buf)) {
+		//fprintf (stderr, "crc8: buffer length %u exceeds maximum %lu\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;
+}
+
+bool crc8_ok(uint8_t bits[], unsigned int len)
+{
+	uint16_t crc = 0;
+	for (unsigned int i=0; i < 8; i++) {
+		crc = (crc << 1) + bits[len+i];
+	}
+	return (crc == crc8(bits,len));
+}
+
+uint8_t crc7(uint8_t bits[], unsigned int len)
+{
+	uint8_t crc=0;
+	unsigned int K = 7;
+  //G7(x) = x7 + x5 + x2 + x + 1   check poly below for correct (dmr rc crc7)
+	uint8_t poly[8] = {1,0,1,0,0,1,1,1}; // crc7 poly
+	uint8_t buf[256];
+	if (len+K > sizeof(buf)) {
+		// fprintf (stderr, "crc8: buffer length %u exceeds maximum %lu\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;
+}
+
+/*
+ * @brief : This function compute the CRC-CCITT of the DMR data
+ *          by using the polynomial x^16 + x^12 + x^5 + 1
+ *
+ * @param Input : A buffer pointer of the DMR data (80 bytes)
+ *
+ * @return The 16 bit CRC
+ */
+
+uint16_t ComputeCrcCCITT(uint8_t * DMRData)
+{
+  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 < 80; i++)
+  {
+    if(((CRC >> 15) & 1) ^ (DMRData[i] & 1))
+    {
+      CRC = (CRC << 1) ^ Polynome;
+    }
+    else
+    {
+      CRC <<= 1;
+    }
+  }
+
+  /* Invert the CRC */
+  CRC ^= 0xFFFF;
+
+  /* Return the CRC */
+  return CRC;
+} /* End ComputeCrcCCITT() */
+
+
+/*
+ * @brief : This function compute the CRC-24 bit of the full
+ *          link control by using the Reed-Solomon(12,9) FEC
+ *
+ * @param FullLinkControlDataBytes : A buffer pointer of the DMR data bytes (12 bytes)
+ *
+ * @param CRCComputed : A 32 bit pointer where the computed CRC 24-bit will be stored
+ *
+ * @param CRCMask : The 24 bit CRC mask to apply
+ *
+ * @return 0 = CRC error
+ *         1 = CRC is correct
+ */
+
+uint32_t ComputeAndCorrectFullLinkControlCrc(uint8_t * FullLinkControlDataBytes, uint32_t * CRCComputed, uint32_t CRCMask)
+{
+  uint32_t i;
+  rs_12_9_codeword_t VoiceLCHeaderStr;
+  rs_12_9_poly_t syndrome;
+  uint8_t errors_found = 0;
+  rs_12_9_correct_errors_result_t result = RS_12_9_CORRECT_ERRORS_RESULT_NO_ERRORS_FOUND;
+  uint32_t CrcIsCorrect = 0;
+
+  for(i = 0; i < 12; i++)
+  {
+    VoiceLCHeaderStr.data[i] = FullLinkControlDataBytes[i];
+
+    /* Apply CRC mask on each 3 last bytes
+     * of the full link control */
+    if(i == 9)
+    {
+      VoiceLCHeaderStr.data[i] ^= (uint8_t)(CRCMask >> 16);
+    }
+    else if(i == 10)
+    {
+      VoiceLCHeaderStr.data[i] ^= (uint8_t)(CRCMask >> 8);
+    }
+    else if(i == 11)
+    {
+      VoiceLCHeaderStr.data[i] ^= (uint8_t)(CRCMask);
+    }
+    else
+    {
+      /* Nothing to do */
+    }
+  }
+
+  /* Check and correct the full link LC control with Reed Solomon (12,9) FEC */
+  rs_12_9_calc_syndrome(&VoiceLCHeaderStr, &syndrome);
+  if(rs_12_9_check_syndrome(&syndrome) != 0) result = rs_12_9_correct_errors(&VoiceLCHeaderStr, &syndrome, &errors_found);
+
+  /* Reconstitue the CRC */
+  *CRCComputed  = (uint32_t)((VoiceLCHeaderStr.data[9]  << 16) & 0xFF0000);
+  *CRCComputed |= (uint32_t)((VoiceLCHeaderStr.data[10] <<  8) & 0x00FF00);
+  *CRCComputed |= (uint32_t)((VoiceLCHeaderStr.data[11] <<  0) & 0x0000FF);
+
+  if((result == RS_12_9_CORRECT_ERRORS_RESULT_NO_ERRORS_FOUND) ||
+     (result == RS_12_9_CORRECT_ERRORS_RESULT_ERRORS_CORRECTED))
+  {
+    //fprintf(stderr, "CRC OK : 0x%06X\n", *CRCComputed);
+    CrcIsCorrect = 1;
+
+    /* Reconstitue full link control data after FEC correction */
+    for(i = 0; i < 12; i++)
+    {
+      FullLinkControlDataBytes[i] = VoiceLCHeaderStr.data[i];
+
+      /* Apply CRC mask on each 3 last bytes
+       * of the full link control */
+      if(i == 9)
+      {
+        FullLinkControlDataBytes[i] ^= (uint8_t)(CRCMask >> 16);
+      }
+      else if(i == 10)
+      {
+        FullLinkControlDataBytes[i] ^= (uint8_t)(CRCMask >> 8);
+      }
+      else if(i == 11)
+      {
+        FullLinkControlDataBytes[i] ^= (uint8_t)(CRCMask);
+      }
+      else
+      {
+        /* Nothing to do */
+      }
+    }
+  }
+  else
+  {
+    //fprintf(stderr, "CRC ERROR : 0x%06X\n", *CRCComputed);
+    CrcIsCorrect = 0;
+  }
+
+  /* Return the CRC status */
+  return CrcIsCorrect;
+} /* End ComputeAndCorrectFullLinkControlCrc() */
+
+
+/*
+ * @brief : This function compute the 5 bit CRC of the DMR voice burst data
+ *          See ETSI TS 102 361-1 chapter B.3.11
+ *
+ * @param Input : A buffer pointer of the DMR data (72 bytes)
+ *
+ * @return The 5 bit CRC
+ */
+
+uint8_t ComputeCrc5Bit(uint8_t * DMRData)
+{
+  uint32_t i, j, k;
+  uint8_t  Buffer[9];
+  uint32_t Sum;
+  uint8_t  CRC = 0;
+
+  /* Convert the 72 bit into 9 bytes */
+  k = 0;
+  for(i = 0; i < 9; i++)
+  {
+    Buffer[i] = 0;
+    for(j = 0; j < 8; j++)
+    {
+      Buffer[i] = Buffer[i] << 1;
+      Buffer[i] = Buffer[i] | DMRData[k++];
+    }
+  }
+
+  /* Add all 9 bytes */
+  Sum = 0;
+  for(i = 0; i < 9; i++)
+  {
+    Sum += (uint32_t)Buffer[i];
+  }
+
+  /* Sum MOD 31 = CRC */
+  CRC = (uint8_t)(Sum % 31);
+
+  /* Return the CRC */
+  return CRC;
+} /* End ComputeCrc5Bit() */
+
+uint64_t ConvertBitIntoBytes(uint8_t * BufferIn, uint32_t BitLength)
+ {
+   uint64_t Output = 0;
+   uint32_t i;
+
+   for(i = 0; i < BitLength; i++)
+   {
+     Output <<= 1;
+     Output |= (uint64_t)(BufferIn[i] & 1);
+   }
+
+   return Output;
+ } /* End ConvertBitIntoBytes() */
+
+/*
+ * @brief : This function compute the CRC-9 of the DMR data
+ *          by using the polynomial x^9 + x^6 + x^4 + x^3 + 1
+ *
+ * @param Input : A buffer pointer of the DMR data (80 bytes)
+ *        Rate 1/2 coded confirmed (10 data octets): 80 bit sequence (80 bytes)
+ *        Rate 3/4 coded confirmed (16 data octets): 128 bit sequence (120 bytes)
+ *        Rate 1 coded confirmed (22 data octets): 176 bit sequence (176 bytes)
+ *
+ * @param NbData : The number of bit to compute
+ *        Rate 1/2 coded confirmed (10 data octets): 80 bit sequence (80 bytes)
+ *        Rate 3/4 coded confirmed (16 data octets): 128 bit sequence (120 bytes)
+ *        Rate 1 coded confirmed (22 data octets): 176 bit sequence (176 bytes)
+ *
+ * @return The 9 bit CRC
+ */
+ uint16_t ComputeCrc9Bit(uint8_t * DMRData, uint32_t NbData)
+{
+  uint32_t i;
+  uint16_t CRC = 0x0000; /* Initialization value = 0x0000 */
+  /* Polynomial x^9 + x^6 + x^4 + x^3 + 1
+   * Normal     = 0x059
+   * Reciprocal = 0x134
+   * Reversed reciprocal = 0x12C */
+  uint16_t Polynome = 0x059;
+  for(i = 0; i < NbData; i++)
+  {
+    if(((CRC >> 8) & 1) ^ (DMRData[i] & 1))
+    {
+      CRC = (CRC << 1) ^ Polynome;
+    }
+    else
+    {
+      CRC <<= 1;
+    }
+  }
+
+  /* Conserve only the 9 LSBs */
+  CRC &= 0x01FF;
+
+  /* Invert the CRC */
+  CRC ^= 0x01FF;
+
+  /* Return the CRC */
+  return CRC;
+} /* End ComputeCrc9Bit() */
+
+/*
+ * @brief : This function compute the CRC-32 of the DMR data
+ *          by using the polynomial x^32 + x^26 + x^23 + x^22 + x^16 + x^12 + x^11 + x^10 + x^8 + x^7 + x^5 + x^4 + x^2 + x + 1
+ *
+ * @param Input : A buffer pointer of the DMR data (80 bytes)
+ *        Rate 1/2 coded confirmed (10 data octets): 80 bit sequence (80 bytes)
+ *        Rate 3/4 coded confirmed (16 data octets): 128 bit sequence (120 bytes)
+ *        Rate 1 coded confirmed (22 data octets): 176 bit sequence (176 bytes)
+ *
+ * @param NbData : The number of bit to compute
+ *        Rate 1/2 coded confirmed (10 data octets): 80 bit sequence (80 bytes)
+ *        Rate 3/4 coded confirmed (16 data octets): 128 bit sequence (120 bytes)
+ *        Rate 1 coded confirmed (22 data octets): 176 bit sequence (176 bytes)
+ *
+ * @return The 32 bit CRC
+ */
+uint32_t ComputeCrc32Bit(uint8_t * DMRData, uint32_t NbData)
+{
+  uint32_t i;
+  uint32_t CRC = 0x00000000; /* Initialization value = 0x00000000 */
+  /* Polynomial x^32 + x^26 + x^23 + x^22 + x^16 + x^12 + x^11 + x^10 + x^8 + x^7 + x^5 + x^4 + x^2 + x + 1
+   * Normal     = 0x04C11DB7
+   * Reversed   = 0xEDB88320
+   * Reciprocal = 0xDB710641
+   * Reversed reciprocal = 0x82608EDB */
+  uint32_t Polynome = 0x04C11DB7;
+  for(i = 0; i < NbData; i++)
+  {
+    if(((CRC >> 31) & 1) ^ (DMRData[i] & 1))
+    {
+      CRC = (CRC << 1) ^ Polynome;
+    }
+    else
+    {
+      CRC <<= 1;
+    }
+  }
+
+  //for whatever reason, we get the CRC returned in a reversed byte order (MSO LSO b***s***)
+  uint32_t a, b, c, d;
+  a = b = c = d = 0;
+  a = (CRC & 0xFF) << 24;
+  b = (CRC & 0xFF00) >> 8;
+  b = b << 16;
+  c = (CRC & 0xFF0000) >> 16;
+  c = c << 8;
+  d = (CRC & 0xFF000000) >> 24;
+
+  CRC = a + b + c + d;
+  /* Return the CRC */
+  return CRC;
+} /* End ComputeCrc32Bit() */

src/dmr_voice.c

@@ -1,660 +0,0 @@
-/*
- * 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.
- */
-
-#include "dsd.h"
-#include "dmr_const.h"
-
-void processDMRvoice (dsd_opts * opts, dsd_state * state)
-{
-  // extracts AMBE frames from DMR frame
-  int i, j, k, l, dibit;
-  int *dibit_p;
-  char ambe_fr[4][24] = {0};
-  char ambe_fr2[4][24] = {0};
-  char ambe_fr3[4][24] = {0};
-  const int *w, *x, *y, *z;
-  char sync[25];
-  char syncdata[48];
-  char cachdata[13] = {0};
-  int mutecurrentslot;
-  int msMode;
-  char cc[4];
-  unsigned char EmbeddedSignalling[16];
-  unsigned int EmbeddedSignallingOk;
-
-#ifdef DMR_DUMP
-  int k;
-  char syncbits[49];
-  char cachbits[25];12
-#endif
-
-  /* Init the superframe buffers */
-  memset(&state->TS1SuperFrame, 0, sizeof(TimeSlotVoiceSuperFrame_t));
-  memset(&state->TS2SuperFrame, 0, sizeof(TimeSlotVoiceSuperFrame_t));
-
-  /* Init the color code status */
-  state->color_code_ok = 0;
-
-  mutecurrentslot = 0;
-  msMode = 0;
-
-  dibit_p = state->dibit_buf_p - 144;
-  for(j = 0; j < 6; j++)
-  {
-    // 2nd half of previous slot
-    for(i = 0; i < 54; i++)
-    {
-      if(j > 0)
-      {
-        dibit = getDibit(opts, state);
-      }
-      else
-      {
-        dibit = *dibit_p;
-        dibit_p++;
-        if(opts->inverted_dmr == 1)
-        {
-          dibit = (dibit ^ 2);
-        }
-      }
-    }
-
-    // CACH
-    for(i = 0; i < 12; i++)
-    {
-      if(j > 0)
-      {
-        dibit = getDibit(opts, state);
-      }
-      else
-      {
-        dibit = *dibit_p;
-        dibit_p++;
-        if(opts->inverted_dmr == 1)
-        {
-          dibit = (dibit ^ 2);
-        }
-      }
-      cachdata[i] = dibit;
-      if(i == 2)
-      {
-        /* Change the current slot only if we are in relayed mode (not in direct mode) */
-        if(state->directmode == 0) state->currentslot = (1 & (dibit >> 1));  // bit 1
-
-        if(state->currentslot == 0)
-        {
-          state->slot1light[0] = '[';
-          state->slot1light[6] = ']';
-          state->slot2light[0] = ' ';
-          state->slot2light[6] = ' ';
-        }
-        else
-        {
-          state->slot2light[0] = '[';
-          state->slot2light[6] = ']';
-          state->slot1light[0] = ' ';
-          state->slot1light[6] = ' ';
-        }
-
-      }
-    }
-    cachdata[12] = 0;
-
-    //set state-dmrburstL and R here to a value for ncurses
-    if (state->currentslot == 0)
-    {
-      state->dmrburstL = 16; //use 16 for Voice?
-    }
-    if (state->currentslot == 1)
-    {
-      state->dmrburstR = 16; //Use 16 for Voice?
-    }
-
-#ifdef DMR_DUMP
-    k = 0;
-    for(i = 0; i < 12; i++)
-    {
-      dibit = cachdata[i];
-      cachbits[k] = (1 & (dibit >> 1)) + 48;        // bit 1
-      k++;
-      cachbits[k] = (1 & dibit) + 48;       // bit 0
-      k++;
-    }
-    cachbits[24] = 0;
-    fprintf(stderr, "%s ", cachbits);
-#endif
-
-    // current slot frame 1
-    w = rW;
-    x = rX;
-    y = rY;
-    z = rZ;
-    k = 0;
-    for(i = 0; i < 36; i++)
-    {
-      if(j > 0)
-      {
-        dibit = getDibit(opts, state);
-      }
-      else
-      {
-        dibit = *dibit_p;
-        dibit_p++;
-        if(opts->inverted_dmr == 1)
-        {
-          dibit = (dibit ^ 2);
-        }
-      }
-      ambe_fr[*w][*x] = (1 & (dibit >> 1)); // bit 1
-      ambe_fr[*y][*z] = (1 & dibit);        // bit 0
-
-      /* Save the current frame in the appropriate superframe buffer */
-      if(state->currentslot == 0)
-      {
-        /* Time slot 1 superframe buffer filling => RAW voice bit */
-        state->TS1SuperFrame.TimeSlotRawVoiceFrame[j].VoiceFrame[0][k++] = (1 & (dibit >> 1)); // bit 1
-        state->TS1SuperFrame.TimeSlotRawVoiceFrame[j].VoiceFrame[0][k++] = (1 & dibit);        // bit 0
-
-        /* Time slot 1 superframe buffer filling => Deinterleaved voice bit */
-        state->TS1SuperFrame.TimeSlotDeinterleavedVoiceFrame[j].DeInterleavedVoiceSample[0][*w][*x] = (1 & (dibit >> 1)); // bit 1
-        state->TS1SuperFrame.TimeSlotDeinterleavedVoiceFrame[j].DeInterleavedVoiceSample[0][*y][*z] = (1 & dibit);        // bit 0
-      }
-      else
-      {
-        /* Time slot 2 superframe buffer filling => RAW voice bit */
-        state->TS2SuperFrame.TimeSlotRawVoiceFrame[j].VoiceFrame[0][k++] = (1 & (dibit >> 1)); // bit 1
-        state->TS2SuperFrame.TimeSlotRawVoiceFrame[j].VoiceFrame[0][k++] = (1 & dibit);        // bit 0
-
-        /* Time slot 2 superframe buffer filling => Deinterleaved voice bit */
-        state->TS2SuperFrame.TimeSlotDeinterleavedVoiceFrame[j].DeInterleavedVoiceSample[0][*w][*x] = (1 & (dibit >> 1)); // bit 1
-        state->TS2SuperFrame.TimeSlotDeinterleavedVoiceFrame[j].DeInterleavedVoiceSample[0][*y][*z] = (1 & dibit);        // bit 0
-      }
-
-      w++;
-      x++;
-      y++;
-      z++;
-    }
-
-    // current slot frame 2 first half
-    w = rW;
-    x = rX;
-    y = rY;
-    z = rZ;
-    k = 0;
-    for(i = 0; i < 18; i++)
-    {
-      if(j > 0)
-      {
-        dibit = getDibit(opts, state);
-      }
-      else
-      {
-        dibit = *dibit_p;
-        dibit_p++;
-        if(opts->inverted_dmr == 1)
-        {
-          dibit = (dibit ^ 2);
-        }
-      }
-      ambe_fr2[*w][*x] = (1 & (dibit >> 1)); // bit 1
-      ambe_fr2[*y][*z] = (1 & dibit);        // bit 0
-
-      /* Save the current frame in the appropriate superframe buffer */
-      if(state->currentslot == 0)
-      {
-        /* Time slot 1 superframe buffer filling => RAW voice bit */
-        state->TS1SuperFrame.TimeSlotRawVoiceFrame[j].VoiceFrame[1][k++] = (1 & (dibit >> 1)); // bit 1
-        state->TS1SuperFrame.TimeSlotRawVoiceFrame[j].VoiceFrame[1][k++] = (1 & dibit);        // bit 0
-
-        /* Time slot 1 superframe buffer filling => Deinterleaved voice bit */
-        state->TS1SuperFrame.TimeSlotDeinterleavedVoiceFrame[j].DeInterleavedVoiceSample[1][*w][*x] = (1 & (dibit >> 1)); // bit 1
-        state->TS1SuperFrame.TimeSlotDeinterleavedVoiceFrame[j].DeInterleavedVoiceSample[1][*y][*z] = (1 & dibit);        // bit 0
-      }
-      else
-      {
-        /* Time slot 2 superframe buffer filling => RAW voice bit */
-        state->TS2SuperFrame.TimeSlotRawVoiceFrame[j].VoiceFrame[1][k++] = (1 & (dibit >> 1)); // bit 1
-        state->TS2SuperFrame.TimeSlotRawVoiceFrame[j].VoiceFrame[1][k++] = (1 & dibit);        // bit 0
-
-        /* Time slot 2 superframe buffer filling => Deinterleaved voice bit */
-        state->TS2SuperFrame.TimeSlotDeinterleavedVoiceFrame[j].DeInterleavedVoiceSample[1][*w][*x] = (1 & (dibit >> 1)); // bit 1
-        state->TS2SuperFrame.TimeSlotDeinterleavedVoiceFrame[j].DeInterleavedVoiceSample[1][*y][*z] = (1 & dibit);        // bit 0
-      }
-
-      w++;
-      x++;
-      y++;
-      z++;
-    }
-
-    l = 0;
-    // signaling data or sync
-    for(i = 0; i < 24; i++)
-    {
-      if(j > 0)
-      {
-        dibit = getDibit(opts, state);
-      }
-      else
-      {
-        dibit = *dibit_p;
-        dibit_p++;
-        if(opts->inverted_dmr == 1)
-        {
-          dibit = (dibit ^ 2);
-        }
-      }
-      syncdata[(2*i)]   = (1 & (dibit >> 1));  // bit 1
-      syncdata[(2*i)+1] = (1 & dibit);         // bit 0
-      sync[i] = (dibit | 1) + 48;
-
-      /* Save the current frame in the appropriate superframe buffer */
-      if(state->currentslot == 0)
-      {
-        /* Time slot 1 superframe buffer filling => SYNC data */
-        state->TS1SuperFrame.TimeSlotRawVoiceFrame[j].Sync[l++] = (1 & (dibit >> 1)); // bit 1
-        state->TS1SuperFrame.TimeSlotRawVoiceFrame[j].Sync[l++] = (1 & dibit);        // bit 0
-      }
-      else
-      {
-        /* Time slot 2 superframe buffer filling => SYNC data */
-        state->TS2SuperFrame.TimeSlotRawVoiceFrame[j].Sync[l++] = (1 & (dibit >> 1)); // bit 1
-        state->TS2SuperFrame.TimeSlotRawVoiceFrame[j].Sync[l++] = (1 & dibit);        // bit 0
-      }
-    }
-    sync[24] = 0;
-
-    /* Copy the Embedded signaling (1st part) */
-    for(i = 0; i < 8; i++)
-    {
-      EmbeddedSignalling[i] = syncdata[i];
-    }
-    /* Copy the Embedded signaling (2nd part) */
-    for(i = 0; i < 8; i++)
-    {
-      EmbeddedSignalling[i + 8] = syncdata[i + 40];
-    }
-
-    /* Check and correct the SlotType (apply Golay(20,8) FEC check) */
-    if(QR_16_7_6_decode(EmbeddedSignalling)) EmbeddedSignallingOk = 1;
-    else EmbeddedSignallingOk = 0;
-
-    /* Get the color code */
-    cc[0] = EmbeddedSignalling[0];
-    cc[1] = EmbeddedSignalling[1];
-    cc[2] = EmbeddedSignalling[2];
-    cc[3] = EmbeddedSignalling[3];
-
-    /* The color code is normally the same for all
-     * 6 received voice frame, so in case of error
-     * do not store it except if the last SYNC frame
-     * has been received. */
-    if(EmbeddedSignallingOk || ((state->color_code_ok == 0) && (j == 5)))
-    {
-      /* Save the color code */
-      state->color_code = (unsigned int)((cc[0] << 3) + (cc[1] << 2) + (cc[2] << 1) + cc[3]);
-      state->color_code_ok = EmbeddedSignallingOk;
-    }
-
-    /* Save the Power Control (PI) indicator */
-    state->PI = (unsigned int)EmbeddedSignalling[4];
-    state->PI_ok = EmbeddedSignallingOk;
-
-    /* Save the Link Control Start Stop (LCSS) indicator */
-    state->LCSS = (unsigned int)((EmbeddedSignalling[5] << 1) + EmbeddedSignalling[6]);
-    state->LCSS_ok = EmbeddedSignallingOk;
-
-    if((strcmp (sync, DMR_BS_DATA_SYNC) == 0) || (strcmp (sync, DMR_MS_DATA_SYNC) == 0))
-    {
-      mutecurrentslot = 1;
-      state->directmode = 0;
-      if(state->currentslot == 0)
-      {
-        sprintf(state->slot1light, "[slot1]");
-      }
-      else
-      {
-        sprintf(state->slot2light, "[slot2]");
-      }
-    }
-    else if(strcmp (sync, DMR_DIRECT_MODE_TS1_DATA_SYNC) == 0)
-    {
-      mutecurrentslot = 1;
-      state->currentslot = 0;
-      state->directmode = 1; /* Direct mode */
-      sprintf(state->slot1light, "[sLoT1]");
-    }
-    else if(strcmp (sync, DMR_DIRECT_MODE_TS2_DATA_SYNC) == 0)
-    {
-      mutecurrentslot = 1;
-      state->currentslot = 1;
-      state->directmode = 1; /* Direct mode */
-      sprintf(state->slot1light, "[sLoT2]");
-    }
-    else if((strcmp (sync, DMR_BS_VOICE_SYNC) == 0) ) //|| (strcmp (sync, DMR_MS_VOICE_SYNC) == 0))
-    {
-      mutecurrentslot = 0;
-      state->directmode = 0;
-      if(state->currentslot == 0)
-      {
-        sprintf(state->slot1light, "[SLOT1]");
-      }
-      else
-      {
-        sprintf(state->slot2light, "[SLOT2]");
-      }
-    }
-    else if(strcmp (sync, DMR_DIRECT_MODE_TS1_VOICE_SYNC) == 0)
-    {
-      mutecurrentslot = 0;
-      state->currentslot = 0;
-      state->directmode = 1; /* Direct mode */
-      sprintf(state->slot1light, "[sLoT1]");
-    }
-    else if(strcmp (sync, DMR_DIRECT_MODE_TS2_VOICE_SYNC) == 0)
-    {
-      mutecurrentslot = 0;
-      state->currentslot = 1;
-      state->directmode = 1; /* Direct mode */
-      sprintf(state->slot2light, "[sLoT2]");
-    }
-
-#ifdef DMR_DUMP
-    k = 0;
-    for(i = 0; i < 24; i++)
-    {
-      dibit = syncdata[i];
-      syncbits[k] = (1 & (dibit >> 1)) + 48;        // bit 1
-      k++;
-      syncbits[k] = (1 & dibit) + 48;       // bit 0
-      k++;
-    }
-    syncbits[48] = 0;
-    fprintf(stderr, "%s ", syncbits);
-#endif
-
-    // current slot frame 2 second half
-    for(i = 0; i < 18; i++)
-    {
-      dibit = getDibit(opts, state);
-      ambe_fr2[*w][*x] = (1 & (dibit >> 1)); // bit 1
-      ambe_fr2[*y][*z] = (1 & dibit);        // bit 0
-
-      /* Save the current frame in the appropriate superframe buffer */
-      if(state->currentslot == 0)
-      {
-        /* Time slot 1 superframe buffer filling => RAW voice bit */
-        state->TS1SuperFrame.TimeSlotRawVoiceFrame[j].VoiceFrame[1][k++] = (1 & (dibit >> 1)); // bit 1
-        state->TS1SuperFrame.TimeSlotRawVoiceFrame[j].VoiceFrame[1][k++] = (1 & dibit);        // bit 0
-
-        /* Time slot 1 superframe buffer filling => Deinterleaved voice bit */
-        state->TS1SuperFrame.TimeSlotDeinterleavedVoiceFrame[j].DeInterleavedVoiceSample[1][*w][*x] = (1 & (dibit >> 1)); // bit 1
-        state->TS1SuperFrame.TimeSlotDeinterleavedVoiceFrame[j].DeInterleavedVoiceSample[1][*y][*z] = (1 & dibit);        // bit 0
-      }
-      else
-      {
-        /* Time slot 2 superframe buffer filling */
-        state->TS2SuperFrame.TimeSlotRawVoiceFrame[j].VoiceFrame[1][k++] = (1 & (dibit >> 1)); // bit 1
-        state->TS2SuperFrame.TimeSlotRawVoiceFrame[j].VoiceFrame[1][k++] = (1 & dibit);        // bit 0
-
-        /* Time slot 2 superframe buffer filling => Deinterleaved voice bit */
-        state->TS2SuperFrame.TimeSlotDeinterleavedVoiceFrame[j].DeInterleavedVoiceSample[1][*w][*x] = (1 & (dibit >> 1)); // bit 1
-        state->TS2SuperFrame.TimeSlotDeinterleavedVoiceFrame[j].DeInterleavedVoiceSample[1][*y][*z] = (1 & dibit);        // bit 0
-      }
-
-      w++;
-      x++;
-      y++;
-      z++;
-    }
-
-    if(mutecurrentslot == 0)
-    {
-      if(state->firstframe == 1)
-      {                   // we don't know if anything received before the first sync after no carrier is valid
-        state->firstframe = 0;
-      }
-      else
-      {
-        //processMbeFrame (opts, state, NULL, ambe_fr, NULL);
-        //processMbeFrame (opts, state, NULL, ambe_fr2, NULL);
-      }
-    }
-
-    // current slot frame 3
-    w = rW;
-    x = rX;
-    y = rY;
-    z = rZ;
-    k = 0;
-    for(i = 0; i < 36; i++)
-    {
-      dibit = getDibit(opts, state);
-      ambe_fr3[*w][*x] = (1 & (dibit >> 1)); // bit 1
-      ambe_fr3[*y][*z] = (1 & dibit);        // bit 0
-
-      /* Save the current frame in the appropriate superframe buffer */
-      if(state->currentslot == 0)
-      {
-        /* Time slot 1 superframe buffer filling => RAW voice bit */
-        state->TS1SuperFrame.TimeSlotRawVoiceFrame[j].VoiceFrame[2][k++] = (1 & (dibit >> 1)); // bit 1
-        state->TS1SuperFrame.TimeSlotRawVoiceFrame[j].VoiceFrame[2][k++] = (1 & dibit);        // bit 0
-
-        /* Time slot 1 superframe buffer filling => Deinterleaved voice bit */
-        state->TS1SuperFrame.TimeSlotDeinterleavedVoiceFrame[j].DeInterleavedVoiceSample[2][*w][*x] = (1 & (dibit >> 1)); // bit 1
-        state->TS1SuperFrame.TimeSlotDeinterleavedVoiceFrame[j].DeInterleavedVoiceSample[2][*y][*z] = (1 & dibit);        // bit 0
-      }
-      else
-      {
-        /* Time slot 2 superframe buffer filling => RAW voice bit */
-        state->TS2SuperFrame.TimeSlotRawVoiceFrame[j].VoiceFrame[2][k++] = (1 & (dibit >> 1)); // bit 1
-        state->TS2SuperFrame.TimeSlotRawVoiceFrame[j].VoiceFrame[2][k++] = (1 & dibit);        // bit 0
-
-        /* Time slot 2 superframe buffer filling => Deinterleaved voice bit */
-        state->TS2SuperFrame.TimeSlotDeinterleavedVoiceFrame[j].DeInterleavedVoiceSample[2][*w][*x] = (1 & (dibit >> 1)); // bit 1
-        state->TS2SuperFrame.TimeSlotDeinterleavedVoiceFrame[j].DeInterleavedVoiceSample[2][*y][*z] = (1 & dibit);        // bit 0
-      }
-
-      w++;
-      x++;
-      y++;
-      z++;
-    }
-    if(mutecurrentslot == 0)
-    {
-      //processMbeFrame (opts, state, NULL, ambe_fr3, NULL);
-    }
-
-    // CACH
-    for(i = 0; i < 12; i++)
-    {
-      dibit = getDibit(opts, state);
-      cachdata[i] = dibit;
-    }
-    cachdata[12] = 0;
-
-#ifdef DMR_DUMP
-    k = 0;
-    for(i = 0; i < 12; i++)
-      {
-        dibit = cachdata[i];
-        cachbits[k] = (1 & (dibit >> 1)) + 48;        // bit 1
-        k++;
-        cachbits[k] = (1 & dibit) + 48;       // bit 0
-        k++;
-      }
-    cachbits[24] = 0;
-    fprintf(stderr, "%s ", cachbits);
-#endif
-
-
-    // next slot
-    skipDibit (opts, state, 54);
-
-    // signaling data or sync
-    for(i = 0; i < 24; i++)
-    {
-      dibit = getDibit(opts, state);
-      syncdata[i] = dibit;
-      sync[i] = (dibit | 1) + 48;
-    }
-    sync[24] = 0;
-    syncdata[24] = 0;
-
-    if((strcmp (sync, DMR_BS_DATA_SYNC) == 0) || (msMode == 1))
-    {
-      state->directmode = 0;
-      if(state->currentslot == 0)
-      {
-        sprintf(state->slot2light, " slot2 ");
-      }
-      else
-      {
-        sprintf(state->slot1light, " slot1 ");
-      }
-    }
-    else if(strcmp (sync, DMR_BS_VOICE_SYNC) == 0)
-    {
-      state->directmode = 0;
-      if(state->currentslot == 0)
-      {
-        sprintf(state->slot2light, " SLOT2 ");
-      }
-      else
-      {
-        sprintf(state->slot1light, " SLOT1 ");
-      }
-    }
-    else if((strcmp (sync, DMR_DIRECT_MODE_TS1_VOICE_SYNC) == 0) || (strcmp (sync, DMR_DIRECT_MODE_TS1_DATA_SYNC) == 0))
-    {
-      state->currentslot = 0;
-      state->directmode = 1; /* Direct mode */
-      sprintf(state->slot1light, " sLoT1 ");
-    }
-    else if((strcmp (sync, DMR_DIRECT_MODE_TS2_VOICE_SYNC) == 0) || (strcmp (sync, DMR_DIRECT_MODE_TS2_DATA_SYNC) == 0))
-    {
-      state->currentslot = 1;
-      state->directmode = 1; /* Direct mode */
-      sprintf(state->slot1light, " sLoT2 ");
-    }
-
-#ifdef DMR_DUMP
-    k = 0;
-    for(i = 0; i < 24; i++)
-      {
-        dibit = syncdata[i];
-        syncbits[k] = (1 & (dibit >> 1)) + 48;        // bit 1
-        k++;
-        syncbits[k] = (1 & dibit) + 48;       // bit 0
-        k++;
-      }
-    syncbits[48] = 0;
-    fprintf(stderr, "%s ", syncbits);
-#endif
-
-    if(j == 5) //j == 5
-    {
-
-      // 2nd half next slot
-      skipDibit (opts, state, 54);
-
-      // CACH
-      skipDibit (opts, state, 12);
-
-      // first half current slot
-      skipDibit (opts, state, 54);
-    }
-
-    /* Extract the 49 bits AMBE of the voice frame */
-    if(state->currentslot == 0)
-    {
-      /* 3 x 49 bit of AMBE sample per voice frame => Slot 1buffer  here */
-      for(i = 0; i < 3; i++)
-      {
-        state->TS1SuperFrame.TimeSlotAmbeVoiceFrame[j].errs1[i] = mbe_eccAmbe3600x2450C0(state->TS1SuperFrame.TimeSlotDeinterleavedVoiceFrame[j].DeInterleavedVoiceSample[i]);
-
-        state->TS1SuperFrame.TimeSlotAmbeVoiceFrame[j].errs2[i] = state->TS1SuperFrame.TimeSlotAmbeVoiceFrame[j].errs1[i];
-
-        mbe_demodulateAmbe3600x2450Data(state->TS1SuperFrame.TimeSlotDeinterleavedVoiceFrame[j].DeInterleavedVoiceSample[i]);
-        state->TS1SuperFrame.TimeSlotAmbeVoiceFrame[j].errs2[i] += mbe_eccAmbe3600x2450Data(state->TS1SuperFrame.TimeSlotDeinterleavedVoiceFrame[j].DeInterleavedVoiceSample[i],
-                                                                                            &(state->TS1SuperFrame.TimeSlotAmbeVoiceFrame[j].AmbeBit[i][0]));
-      }
-
-    }
-    else
-    {
-      /* 3 x 49 bit of AMBE sample per voice frame => Slot 2 buffer here */
-      for(i = 0; i < 3; i++)
-      {
-        state->TS2SuperFrame.TimeSlotAmbeVoiceFrame[j].errs1[i] = mbe_eccAmbe3600x2450C0(state->TS2SuperFrame.TimeSlotDeinterleavedVoiceFrame[j].DeInterleavedVoiceSample[i]);
-
-        state->TS2SuperFrame.TimeSlotAmbeVoiceFrame[j].errs2[i] = state->TS2SuperFrame.TimeSlotAmbeVoiceFrame[j].errs1[i];
-
-        mbe_demodulateAmbe3600x2450Data(state->TS2SuperFrame.TimeSlotDeinterleavedVoiceFrame[j].DeInterleavedVoiceSample[i]);
-        state->TS2SuperFrame.TimeSlotAmbeVoiceFrame[j].errs2[i] += mbe_eccAmbe3600x2450Data(state->TS2SuperFrame.TimeSlotDeinterleavedVoiceFrame[j].DeInterleavedVoiceSample[i],
-                                                                                            &(state->TS2SuperFrame.TimeSlotAmbeVoiceFrame[j].AmbeBit[i][0]));
-      }
-
-    }
-
-  }  /* End for(j = 0; j < 6; j++) */
-
-  if(opts->errorbars == 1)
-  {
-    fprintf(stderr, "%s %s ", state->slot1light, state->slot2light);
-
-    /* Print the color code */
-    fprintf (stderr, "%s", KCYN);
-    fprintf(stderr, "| Color Code=%02d ", (int)state->color_code);
-    fprintf (stderr, "%s", KNRM);
-
-    //if(state->color_code_ok) fprintf(stderr, "(OK)      |");
-    if(state->color_code_ok)
-    {
-      fprintf(stderr, "| (CRC OK ) |"); //add line break
-      state->dmr_color_code = state->color_code; //set here when voice? otherwise is set off of idle.
-    }
-    else
-    {
-      fprintf (stderr, "%s", KRED);
-      fprintf(stderr, "| (CRC ERR) |"); //add line break
-      fprintf (stderr, "%s", KNRM);
-    }
-
-    fprintf(stderr, " VOICE ");
-  }
-
-  /* Perform the SYNC DMR data embedded decoding */
-  ProcessVoiceBurstSync(opts, state);
-
-  /* Perform the DMR voice decoding */
-  ProcessDMR(opts, state);
-
-  //LFSR if required, change condition?
-  if ( (state->currentslot == 0 && state->payload_algid  == 0x21 ) ||  //&& opts->payload == 1
-       (state->currentslot == 1 && state->payload_algidR == 0x21 )  ) //&& opts->payload == 1
-  {
-    LFSR(state);
-  }
-
-  if(opts->errorbars == 1)
-  {
-    fprintf(stderr, "\n");
-  }
-
-} /* End processDMRvoice() */

src/dpmr_voice.c

@@ -24,11 +24,18 @@ void processdPMRvoice (dsd_opts * opts, dsd_state * state)
   uint8_t CCH[NB_OF_DPMR_VOICE_FRAME_TO_DECODE][72] = {0};
   uint8_t CCHDescrambled[NB_OF_DPMR_VOICE_FRAME_TO_DECODE][72] = {0};
   uint8_t CCHDeInterleaved[NB_OF_DPMR_VOICE_FRAME_TO_DECODE][72] = {0};
-  uint8_t CCHDataHammingCorrected[NB_OF_DPMR_VOICE_FRAME_TO_DECODE][48] = {0};
+  uint8_t CCHDataHammingCorrected[NB_OF_DPMR_VOICE_FRAME_TO_DECODE][48];
-  uint8_t CCHDataCRC[NB_OF_DPMR_VOICE_FRAME_TO_DECODE] = {0};
+  uint8_t CCHDataCRC[NB_OF_DPMR_VOICE_FRAME_TO_DECODE];
-  uint8_t CCHDataCRCComputed[NB_OF_DPMR_VOICE_FRAME_TO_DECODE] = {0};
+
+  memset (CCHDataHammingCorrected, 1, sizeof(CCHDataHammingCorrected));
+  memset (CCHDataCRC, 1, sizeof(CCHDataCRC));
+
+  uint8_t CCHDataCRCComputed[NB_OF_DPMR_VOICE_FRAME_TO_DECODE];
+  memset (CCHDataCRCComputed, 0, sizeof(CCHDataCRCComputed));
+
   uint8_t CC[NB_OF_DPMR_VOICE_FRAME_TO_DECODE / 2][24] = {0};
-  char ambe_fr[NB_OF_DPMR_VOICE_FRAME_TO_DECODE * 4][4][24] = {0};
+  char ambe_fr[NB_OF_DPMR_VOICE_FRAME_TO_DECODE * 4][4][24];
+  memset (ambe_fr, 0, sizeof (ambe_fr));
   const int *w, *x, *y, *z;
   uint32_t  ScramblerLFSR = 0;
   bool correctable = true;
@@ -46,20 +53,10 @@ 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);
-  if (opts->errorbars == 1)
-  {
-    //fprintf(stderr, "VOICE e:");
-  }
 
   /* First CCH (Control CHannel) - 72 bit */
   k = 0;
@@ -76,7 +73,6 @@ void processdPMRvoice (dsd_opts * opts, dsd_state * state)
     CCH[0][(i * 2)]     =  (1 & (dibit >> 1));   // bit 1
     CCH[0][(i * 2) + 1] =  (1 & dibit);          // bit 0
 
-
   }
 
   /* 4 TCH (Traffic CHannel) = 4 x 72 bit voice playload */
@@ -148,9 +144,6 @@ void processdPMRvoice (dsd_opts * opts, dsd_state * state)
 
   /* 4 TCH (Traffic CHannel) = 4 x 72 bit voice playload */
 
-  //Sync issues occur when FS2 occurs immediatly after the 4th rep, so cutting of 4 early to gain constant resync
-  //probably can't resync fast enough when the next sync starts immediately after the 4th rep of 36 dibits
-  //consider writing a method that will loop this entire process based on the frame numbering found inside the CCH info, is that possible?
   k = 0;
   for (j = 0; j < 4; j++)
   {
@@ -177,18 +170,10 @@ void processdPMRvoice (dsd_opts * opts, dsd_state * state)
       x++;
       y++;
       z++;
-      if (j == 3 && i == 28) //find sweet spot to cut off early
+
-      {
-        i = 40; //break early so FS2 sync can resync
-      }
     }
   }
 
-  /* Initialize the Hamming (12,8) error code detection
-   * Not needed because it has already been done
-   * in the "InitAllFecFunction()" function */
-  //Hamming_12_8_init();
-
   /* Decoding all CCH (Control CHannel) */
   for(i = 0; i < NB_OF_DPMR_VOICE_FRAME_TO_DECODE; i++)
   {
@@ -209,22 +194,8 @@ void processdPMRvoice (dsd_opts * opts, dsd_state * state)
       if(HammingCorrectable[i][j] == false) correctable = false;
     }
 
-    if(correctable)
+    if(correctable) HammingOk[i] = 1;
-    {
+    else HammingOk[i] = 0;
-
-      //fprintf(stderr, "CCH data corrected successfully\n");
-
-
-      HammingOk[i] = 1;
-    }
-    else
-    {
-
-      //fprintf(stderr, "ERROR !!! CCH data contains uncorrectable bit\n");
-
-
-      HammingOk[i] = 0;
-    }
 
     /* Reconstitute the 7 bit CRC */
     CCHDataCRC[i] = 0;
@@ -239,24 +210,8 @@ void processdPMRvoice (dsd_opts * opts, dsd_state * state)
     /* Compute the 7 bit CRC */
     CCHDataCRCComputed[i] = CRC7BitdPMR(CCHDataHammingCorrected[i], 41);
 
-    if(CCHDataCRC[i] == CCHDataCRCComputed[i])
+    if(CCHDataCRC[i] == CCHDataCRCComputed[i]) CrcOk[i] = 1;
-    {
+    else CrcOk[i] = 0;
-
-      //fprintf(stderr, "Good CCH CRCs ! CRC received = 0x%02X, CRC computed = 0x%02X\n",
-      //       CCHDataCRC[i], CCHDataCRCComputed[i]);
-
-
-      CrcOk[i] = 1;
-    }
-    else
-    {
-
-      //fprintf(stderr, "ERROR !!! CCH CRCs are different ! CRC received = 0x%02X, CRC computed = 0x%02X\n",
-      //       CCHDataCRC[i], CCHDataCRCComputed[i]);
-
-
-      CrcOk[i] = 0;
-    }
 
     /* Fill the frame number */
     CCH_FrameNumber[i] = ConvertBitIntoBytes(&CCHDataHammingCorrected[i][0], 2);
@@ -302,45 +257,18 @@ void processdPMRvoice (dsd_opts * opts, dsd_state * state)
   CallingID[7] = '\0';
 
 
-  /* Print Hamming debug info */
-  //fprintf(stderr, " | ");
-  for(i = 0; i < NB_OF_DPMR_VOICE_FRAME_TO_DECODE; i++)
-  {
-    //fprintf(stderr, "Hamming[%u]=", i);
-    for(j = 0; j < 6; j++)
-    {
-      //if(HammingCorrectable[i][j]) fprintf(stderr, "1");
-      //else fprintf(stderr, "0");
-    }
-    //fprintf(stderr, " HammingOk[%u]=%u", i, HammingOk[i]);
-    //fprintf(stderr, " CrcOk[%u]=%u", i, CrcOk[i]);
-    //fprintf(stderr, " Bit[%u]=", i);
-    //for(j = 0; j < 7; j++)
-    //{
-    //  if(CCHDataHammingCorrected[i][j + 41]) fprintf(stderr, "1");
-    //  else fprintf(stderr, "0");
-    //}
-    //fprintf(stderr, " CRCrec=0x%02X CRCcomp=0x%02X", CCHDataCRC[i], CCHDataCRCComputed[i]);
-    //if(i < (NB_OF_DPMR_VOICE_FRAME_TO_DECODE - 1)) fprintf(stderr, " - ");
-  }
-
-
-
-#if (NB_OF_DPMR_VOICE_FRAME_TO_DECODE == 2)
   /* To determine the part of the payload frame, we need to check the
    * Hamming code result, the CRC and the frame number */
+
 //  if( (HammingOk[0] && CrcOk[0] && (CCH_FrameNumber[0] == 0)) ||
 //      (HammingOk[1] && CrcOk[1] && (CCH_FrameNumber[1] == 1)))
+
   if(((CrcOk[0] || HammingCorrectable[0][0]) && (CCH_FrameNumber[0] == 0)) ||
      ((CrcOk[1] || HammingCorrectable[1][0]) && (CCH_FrameNumber[1] == 1)))
   {
     /* First part of the super frame */
     PartOfSuperFrame = 1;
 
-
-    //fprintf(stderr, "\nFirst part of the Super Frame");
-
-
     /* The next part will normally be the second part */
     opts->dPMR_next_part_of_superframe = 2;
 
@@ -368,20 +296,19 @@ void processdPMRvoice (dsd_opts * opts, dsd_state * state)
     /* BUGFIX : Copy in all case the TG ID */
     strcpy((char *)state->dPMRVoiceFS2Frame.CalledID, (char *)CalledID);
   }
+
   /* To determine the part of the payload frame, we need to check the
    * Hamming code result, the CRC and the frame number */
+
 //  else if( (HammingOk[0] && CrcOk[0] && (CCH_FrameNumber[0] == 2)) ||
 //           (HammingOk[1] && CrcOk[1] && (CCH_FrameNumber[1] == 3)))
+
   else if(((CrcOk[0] || HammingCorrectable[0][0]) && (CCH_FrameNumber[0] == 2)) ||
           ((CrcOk[1] || HammingCorrectable[1][0]) && (CCH_FrameNumber[1] == 3)))
   {
     /* Second part of the super frame */
     PartOfSuperFrame = 2;
 
-
-    //fprintf(stderr, "\nSecond part of the Super Frame");
-
-
     /* The next part will normally be the first part */
     opts->dPMR_next_part_of_superframe = 1;
 
@@ -394,7 +321,9 @@ void processdPMRvoice (dsd_opts * opts, dsd_state * state)
     CallingID[7] = '\0';
 
     /* Determine if the calling SRC ID is correct */
+
     //if(HammingOk[0] && CrcOk[0] && HammingOk[1] && CrcOk[1])
+
     if((CrcOk[0] || (HammingCorrectable[0][0] && HammingCorrectable[0][1])) &&
        (CrcOk[1] || (HammingCorrectable[1][0] && HammingCorrectable[1][1])))
     {
@@ -422,132 +351,147 @@ void processdPMRvoice (dsd_opts * opts, dsd_state * state)
     /* Set the next part of the superframe to receive */
     if(opts->dPMR_next_part_of_superframe == 1)
     {
-
-
-      //fprintf(stderr, "Supposed first part of the Super Frame\n");
-
-
       /* Set the next part as the second part */
       opts->dPMR_next_part_of_superframe = 2;
     }
     else if(opts->dPMR_next_part_of_superframe == 2)
     {
-
-      //fprintf(stderr, "Supposed second part of the Super Frame\n");
-
-
       /* Set the next part as the first part */
       opts->dPMR_next_part_of_superframe = 1;
     }
     else
     {
-
-
-      //fprintf(stderr, "Unknown part of the Super Frame\n");
-
-
       /* Unknown current part, set to 0 */
       opts->dPMR_next_part_of_superframe = 0;
     }
   }
 
-  if(state->dPMRVoiceFS2Frame.ColorCode[0] != (unsigned int)(-1))
-  {
-    //only print the CC and src/tg info if CRC is good
-    /* Display the color code */
-    //fprintf(stderr, " | Color Code=%02d ", (int)state->dPMRVoiceFS2Frame.ColorCode[0]);
-  }
-  else
-  {
-    /* Unknown color code, display "??" */
-    //fprintf(stderr, " | Color Code=?? ");
-  }
-
   /* Display the destination ID (talk group - TG) */
-  //fprintf(stderr, "| TG=%s", CalledID);
+  fprintf (stderr, "\n");
+
   if(state->dPMRVoiceFS2Frame.CalledIDOk)
   {
     fprintf (stderr, "%s", KGRN);
-    fprintf(stderr, "\n| TG=%s", CalledID);
+    fprintf(stderr, " TG=%s", CalledID);
     fprintf (stderr, "%s", KNRM);
-    //strcpy (state->dpmr_target_id, CalledID); //HERE HERE
+
-    state->dpmr_target_id = CalledID;
+    //check other as well before assigning
-    //fprintf(stderr, " (CRC OK)      ");
+    if(state->dPMRVoiceFS2Frame.CallingIDOk) sprintf (state->dpmr_target_id, "%s", CalledID);
+
+  }
+  else
+  {
+    fprintf (stderr, "%s", KRED);
+    fprintf(stderr, " TG=(CRC ERR)");
+    fprintf (stderr, "%s", KNRM);
+  }
+
+  /* Display the source ID */
+  if(state->dPMRVoiceFS2Frame.CallingIDOk)
+  {
+    fprintf (stderr, "%s", KGRN);
+    fprintf(stderr, " Src=%s", CallingID);
+    fprintf (stderr, "%s", KNRM);
+
+    //check other as well before assigning
+    if(state->dPMRVoiceFS2Frame.CalledIDOk) sprintf (state->dpmr_caller_id, "%s", CallingID);
+
+    //stashed channel code in here, more likely to be correct, but no guarantee
     if(state->dPMRVoiceFS2Frame.ColorCode[0] != (unsigned int)(-1))
     {
       fprintf (stderr, "%s", KGRN);
-      fprintf(stderr, " | Color Code=%02d ", (int)state->dPMRVoiceFS2Frame.ColorCode[0]);
+      fprintf(stderr, " Channel Code=%02d", (int)state->dPMRVoiceFS2Frame.ColorCode[0]);
       fprintf (stderr, "%s", KNRM);
-      state->dpmr_color_code = (int)state->dPMRVoiceFS2Frame.ColorCode[0];
 
+      //check other as well before assigning
+      if(state->dPMRVoiceFS2Frame.CalledIDOk) state->dpmr_color_code = (int)state->dPMRVoiceFS2Frame.ColorCode[0];
     }
 
   }
   else
-  {
-    //fprintf(stderr, " (CRC ERR) ");
-  }
-
-  /* Display the source ID */
-  //fprintf(stderr, "| Src=%s", CallingID);
-  if(state->dPMRVoiceFS2Frame.CallingIDOk)
-  {
-    fprintf (stderr, "%s", KGRN);
-    fprintf(stderr, "| Src=%s", CallingID);
-    fprintf (stderr, "%s", KNRM);
-    //strcpy (state->dpmr_caller_id, CallingID);
-    state->dpmr_caller_id = CallingID;
-
-    //fprintf(stderr, " (CRC OK)      \n");
-  }
-  else
   {
   fprintf (stderr, "%s", KRED);
-  fprintf(stderr, " (CRC ERR) \n");
+  fprintf(stderr, " Src=(CRC ERR) Channel Code =(CRC ERR)");
-  fprintf (stderr, "%s", KNRM);
+  fprintf (stderr, "%s", KNRM); 
   }
 
-#endif /* (NB_OF_DPMR_VOICE_FRAME_TO_DECODE == 2) */
+  if (state->dPMRVoiceFS2Frame.Version[0] == 3)
+  {
+    fprintf (stderr, "%s", KRED);
+    fprintf (stderr, " Scrambler");
+    fprintf (stderr, "%s", KNRM);
+    if (state->R != 0)
+    {
+      fprintf (stderr, "%s", KYEL);
+      fprintf (stderr, " Key %05lld ", state->R );
+      fprintf (stderr, "%s", KNRM);
+    }
+  }
 
   //Play only voice frames by first looking to see if there is a TCH voice in CommunicationMode,
-  //then sending it to be processed by processMbeFrame, its much cleaner this way
   short start = 0;
   short end = 4;
+
+  //not really even sure why I made this loop
+  //I probably should actually read the manual again
   for (short o = 0; o < 2; o++)
   {
+
+    //reset scrambler key seed on frame 0
+    if (state->dPMRVoiceFS2Frame.FrameNumbering[o] == 0) state->payload_miN = 0;
+    
     //depending on first or second TCH, set start and end variables appropriately
     if (o == 1)
     {
       start = 4;
       end = 8;
-      //add extra line break on second repitition only when dumping payload to console
-      if (opts->payload == 1)
-      {
-        fprintf(stderr, "\n");
-      }
 
     }
-    //fprintf (stderr, "\nCommunication Mode: %d\n", state->dPMRVoiceFS2Frame.CommunicationMode[o]);
+
-    //fprintf (stderr, "Encryption Mode: %d\n", state->dPMRVoiceFS2Frame.Version[o]);
+    //this is used so we can simply pass the voice here to the 
-    //fprintf (stderr, "Superframe Number: %d", state->dPMRVoiceFS2Frame.FrameNumbering[o]); //should be 1-4, but may be same number on TCH 1 or TCH 2
+    //nxdn scrambler by telling mbe these are nxdn frames and to
+    //apply the same descramble method to them if necessary
+    int realsynctype = state->synctype; 
+
+    // fprintf (stderr, "\nCommunication Mode: %d\n", state->dPMRVoiceFS2Frame.CommunicationMode[o]);
+    // fprintf (stderr, "Encryption Mode: %d\n", state->dPMRVoiceFS2Frame.Version[o]); //shows as 3 (manufacturer specific, 5.16) on the dPMR scrambler values received
+    // fprintf (stderr, "Superframe Number: %d", state->dPMRVoiceFS2Frame.FrameNumbering[o]); 
+
     if((state->dPMRVoiceFS2Frame.CommunicationMode[o] == 0) ||
        (state->dPMRVoiceFS2Frame.CommunicationMode[o] == 1) ||
        (state->dPMRVoiceFS2Frame.CommunicationMode[o] == 5))
     {
 
-      //There are 4 AMBE voice samples per TCH
+      //check to see if we are using scrambler
+      if (state->dPMRVoiceFS2Frame.Version[o] == 3) //!= 0
+      {
+        state->synctype = 28; //fake it as nxdn
+        state->nxdn_cipher_type = 0x01; //turn on nxdn scrambler cipher
+        state->dmr_encL = 1; //flag on enc bit here so we can mute if no key provided
+      }
+      
+      //flag back off if key is provided
+      if (state->R != 0) state->dmr_encL = 0;
+      
+      //There are 4 AMBE voice frames per TCH
       for(i = start; i < end; i++)
       {
         processMbeFrame (opts, state, NULL, ambe_fr[i], NULL);
-      } //End for(i = start; i < end); i++)
+        if (opts->floating_point == 0)
-    } //if comms and not encrypted
+          playSynthesizedVoice(opts, state);
-  }//End for TCH for o loop
+        if (opts->floating_point == 1)
+          playSynthesizedVoiceFM(opts, state);
+      } 
 
+      //set the correct sync type again and flag off the cipher
+      state->synctype = realsynctype;
+      state->nxdn_cipher_type = 0;
+
+    } 
+  } 
+
+  fprintf(stderr, "\n");
 
-  if (opts->errorbars == 1)
-  {
-    fprintf(stderr, "\n");
-  }
 
 //keep code below, could be handy cheat sheet for other info
 #ifdef dPMR_PRINT_DEBUG_INFO

src/dsd_audio.c

@@ -21,14 +21,13 @@ pa_sample_spec ss;
 pa_sample_spec tt;
 pa_sample_spec zz;
 pa_sample_spec cc;
+pa_sample_spec ff; //float
 
 void closePulseOutput (dsd_opts * opts)
 {
   pa_simple_free (opts->pulse_digi_dev_out);
-  if (opts->dmr_stereo == 1)
+  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);
-    pa_simple_free (opts->pulse_digi_dev_outR);
-  }
 }
 
 void closePulseInput (dsd_opts * opts)
@@ -40,33 +39,29 @@ void openPulseOutput(dsd_opts * opts)
 {
 
   ss.format = PA_SAMPLE_S16NE;
-  ss.channels = opts->pulse_raw_out_channels; //doing tests with 2 channels at 22050 for 44100 audio default in pulse
+  ss.channels = opts->pulse_raw_out_channels;
-  ss.rate = opts->pulse_raw_rate_out; //48000
+  ss.rate = opts->pulse_raw_rate_out;
 
   tt.format = PA_SAMPLE_S16NE;
-  tt.channels = opts->pulse_digi_out_channels; //doing tests with 2 channels at 22050 for 44100 audio default in pulse
+  tt.channels = opts->pulse_digi_out_channels;
-  tt.rate = opts->pulse_digi_rate_out; //48000, switches to 8000 when using RTL dongle
+  tt.rate = opts->pulse_digi_rate_out;
 
-  if (opts->monitor_input_audio == 1)
+  ff.format = PA_SAMPLE_FLOAT32NE;
-  {
+  ff.channels = opts->pulse_digi_out_channels;
-    opts->pulse_raw_dev_out  = pa_simple_new(NULL, "DSD-FME3", PA_STREAM_PLAYBACK, NULL, "Raw Audio Out", &ss, NULL, NULL, NULL);
+  ff.rate = opts->pulse_digi_rate_out;
-  }
 
-//tt
+  //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
-  pa_channel_map* left = 0; //NULL and 0 are same in this context
+  if (opts->frame_provoice == 1 || opts->monitor_input_audio == 1)
-  pa_channel_map* right = 0; //NULL and 0 are same in this context
+    opts->pulse_raw_dev_out  = pa_simple_new(NULL, "DSD-FME3", PA_STREAM_PLAYBACK, NULL, "Analog", &ss, 0, NULL, NULL);
 
-  if (opts->dmr_stereo == 0)
+  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
-    opts->pulse_digi_dev_out = pa_simple_new(NULL, "DSD-FME", PA_STREAM_PLAYBACK, NULL, opts->output_name, &tt, left, NULL, NULL);
 
-  }
+  if (opts->floating_point == 0)
+    opts->pulse_digi_dev_out = pa_simple_new(NULL, "DSD-FME", PA_STREAM_PLAYBACK, NULL, opts->output_name, &tt, ss, NULL, NULL);
 
-  if (opts->dmr_stereo == 1)
+  if (opts->floating_point == 1)
-  {
+    opts->pulse_digi_dev_out = pa_simple_new(NULL, "DSD-FME", PA_STREAM_PLAYBACK, NULL, opts->output_name, &ff, fl, NULL, NULL);
-    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);
-  }
 
 }
 
@@ -81,6 +76,121 @@ void openPulseInput(dsd_opts * opts)
 
 }
 
+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
 processAudio (dsd_opts * opts, dsd_state * state)
 {
@@ -92,11 +202,7 @@ processAudio (dsd_opts * opts, dsd_state * state)
     {
       // detect max level
       max = 0;
-      //attempt to reduce crackle by overriding the max value when not using pulse input
+
-      if (opts->audio_in_type != 0)
-      {
-        max = 3000;
-      }
       state->audio_out_temp_buf_p = state->audio_out_temp_buf;
       for (n = 0; n < 160; n++)
         {
@@ -176,8 +282,7 @@ 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++)
@@ -201,6 +306,8 @@ 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++;
         }
@@ -219,6 +326,10 @@ 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++;
@@ -238,11 +349,7 @@ processAudioR (dsd_opts * opts, dsd_state * state)
     {
       // detect max level
       max = 0;
-      //attempt to reduce crackle by overriding the max value when not using pulse input
+
-      if (opts->audio_in_type != 0)
-      {
-        max = 3000;
-      }
       state->audio_out_temp_buf_pR = state->audio_out_temp_bufR;
       for (n = 0; n < 160; n++)
         {
@@ -323,7 +430,6 @@ 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++)
@@ -347,6 +453,8 @@ 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++;
         }
@@ -365,6 +473,8 @@ 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++;
@@ -431,10 +541,9 @@ void writeSynthesizedVoiceR (dsd_opts * opts, dsd_state * state)
 
 void writeRawSample (dsd_opts * opts, dsd_state * state, short sample)
 {
-  int n;
+  UNUSED(state);
-  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
@@ -449,24 +558,46 @@ 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)
   {
-    // output synthesized speech to sound card
+    if (opts->audio_out_type == 5) //OSS
-		if(opts->audio_out_type == 2)
-		{
-      //go F yourself PA
-		}
-		else
     {
-      //Test just sending it straight on since I think I've figured out the STDIN and RTL for Stereo
+      //OSS 48k/1
-      pa_simple_write(opts->pulse_digi_dev_out, (state->audio_out_buf_p - state->audio_out_idx), (state->audio_out_idx * 2), NULL); //Yay! It works.
+      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;
     }
+		else if (opts->audio_out_type == 0)
+    {
+      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;
@@ -482,19 +613,28 @@ 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 == 2)
+		if (opts->audio_out_type == 5) //OSS
-		{
-      //go F yourself PA
-		}
-		else
     {
-      pa_simple_write(opts->pulse_digi_dev_outR, (state->audio_out_buf_pR - state->audio_out_idxR), (state->audio_out_idxR * 2), NULL); //Yay! It works.
+      //OSS 48k/1
+      result = write (opts->audio_out_fd, (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)
+    {
+      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
 
   }
 
@@ -511,6 +651,8 @@ 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)
 	{
@@ -525,7 +667,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);
@@ -545,74 +687,198 @@ openAudioOutDevice (dsd_opts * opts, int speed)
 void
 openAudioInDevice (dsd_opts * opts)
 {
-  // get info of device/file
+  char * extension;
-	if(strncmp(opts->audio_in_dev, "-", 1) == 0)
+  const char ch = '.';
-	{
+  extension = strrchr(opts->audio_in_dev, ch); //return extension if this is a .wav or .bin file
-		opts->audio_in_type = 1;
-		opts->audio_in_file_info = calloc(1, sizeof(SF_INFO));
-		opts->audio_in_file_info->samplerate=48000;
-    opts->pulse_digi_rate_out = 8000; //set out rate to 8000 for stdin input
-		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->audio_in_file = sf_open_fd(fileno(stdin), SFM_READ, opts->audio_in_file_info, 0);
 
-		if(opts->audio_in_file == NULL) {
+  //if no extension set, give default of .wav -- bugfix for github issue #105
-			fprintf (stderr,"Error, couldn't open stdin with libsndfile: %s\n", sf_strerror(NULL));
+  // if (extension == NULL) extension = ".wav";
-			exit(1); //had this one disabled, re-enabling it now
+
-		}
+  // get info of device/file
-	}
+	if (strncmp(opts->audio_in_dev, "-", 1) == 0)
-  //converted to handle any calls to use portaudio
-	else if(strncmp(opts->audio_in_dev, "pa:", 2) == 0)
 	{
-		opts->audio_in_type = 0;
+    opts->audio_in_type = 1;
-    fprintf (stderr,"Error, Port Audio is not supported by FME!\n");
+    opts->audio_in_file_info = calloc(1, sizeof(SF_INFO));
-    fprintf (stderr,"Using Pulse Audio Input Stream Instead! \n");
+    opts->audio_in_file_info->samplerate=opts->wav_sample_rate;
-    sprintf (opts->audio_in_dev, "pulse");
+    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->audio_in_file = sf_open_fd(fileno(stdin), SFM_READ, opts->audio_in_file_info, 0);
+
+    if(opts->audio_in_file == NULL)
+    {
+      fprintf(stderr, "Error, couldn't open stdin with libsndfile: %s\n", sf_strerror(NULL));
+      exit(1);
+    }
 	}
+
+  else if (strncmp(opts->audio_in_dev, "tcp", 3) == 0)
+  {
+    opts->audio_in_type = 8;
+    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->tcp_file_in = sf_open_fd(opts->tcp_sockfd, SFM_READ, opts->audio_in_file_info, 0);
+    if(opts->tcp_file_in == NULL)
+    {
+      fprintf(stderr, "Error, couldn't open TCP 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
     opts->audio_in_type = 3;
+    #elif AERO_BUILD
+    opts->audio_in_type = 5;
+    sprintf (opts->audio_in_dev, "/dev/dsp");
+    #else
+    opts->audio_in_type = 0;
+    sprintf (opts->audio_in_dev, "pulse");
+    #endif
   }
   else if(strncmp(opts->audio_in_dev, "pulse", 5) == 0)
   {
     opts->audio_in_type = 0;
   }
-  //convert from opening wav files to OP25 symbol capture files since opening wav files is busted
+  else if((strncmp(opts->audio_in_dev, "/dev/dsp", 8) == 0))
+  {
+    opts->audio_in_type = 5;
+  }
+
+  //if no extension set, treat as named pipe or extensionless wav file -- bugfix for github issue #105
+  else if (extension == NULL)
+  {
+    opts->audio_in_type = 2;
+    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->audio_in_file = sf_open(opts->audio_in_dev, SFM_READ, opts->audio_in_file_info);
+
+    if (opts->audio_in_file == NULL)
+    {
+      fprintf(stderr, "Error, couldn't open file/pipe with libsndfile: %s\n", sf_strerror(NULL));
+      exit(1);
+    }
+  }
+
+  //test .rrc files with hardset wav file settings
+  else if (strncmp(extension, ".rrc", 3) == 0)
+	{
+    //debug
+    fprintf (stderr, "Opening M17 .rrc headless wav file\n");
+    
+    opts->audio_in_type = 2;
+    opts->audio_in_file_info = calloc(1, sizeof(SF_INFO));
+    opts->audio_in_file_info->samplerate = 48000;
+    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->audio_in_file = sf_open(opts->audio_in_dev, SFM_READ, opts->audio_in_file_info);
+
+    if(opts->audio_in_file == NULL)
+    {
+      fprintf(stderr, "Error, couldn't open %s with libsndfile: %s\n", opts->audio_in_dev, sf_strerror(NULL));
+      exit(1);
+    }
+	}
+
+  //TODO: test .sym files as symbol capture .bin files
+  else if (strncmp(extension, ".sym", 3) == 0)
+	{
+    struct stat stat_buf;
+    if (stat(opts->audio_in_dev, &stat_buf) != 0)
+    {
+      fprintf (stderr,"Error, couldn't open bin file %s\n", opts->audio_in_dev);
+      exit(1);
+    }
+    if (S_ISREG(stat_buf.st_mode))
+    {
+      opts->symbolfile = fopen(opts->audio_in_dev, "r");
+      opts->audio_in_type = 4; //symbol capture bin files
+    }
+    else
+    {
+      opts->audio_in_type = 0;
+    }
+  }
+
+  else if (strncmp(extension, ".bin", 3) == 0)
+	{
+    struct stat stat_buf;
+    if (stat(opts->audio_in_dev, &stat_buf) != 0)
+    {
+      fprintf (stderr,"Error, couldn't open bin file %s\n", opts->audio_in_dev);
+      exit(1);
+    }
+    if (S_ISREG(stat_buf.st_mode))
+    {
+      opts->symbolfile = fopen(opts->audio_in_dev, "r");
+      opts->audio_in_type = 4; //symbol capture bin files
+    }
+    else
+    {
+      opts->audio_in_type = 0;
+    }
+  }
+  //open as wav file as last resort, wav files subseptible to sample rate issues if not 48000
 	else
 	{
     struct stat stat_buf;
     if (stat(opts->audio_in_dev, &stat_buf) != 0)
     {
-      fprintf (stderr,"Error, couldn't open %s\n", opts->audio_in_dev);
+      fprintf (stderr,"Error, couldn't open wav file %s\n", opts->audio_in_dev);
       exit(1);
     }
     if (S_ISREG(stat_buf.st_mode))
     {
-      // is this a regular file? then process with libsndfile.
+      opts->audio_in_type = 2; //two now, seperating STDIN and wav files
-      //opts->pulse_digi_rate_out = 8000; //this for wav files input?
+      opts->audio_in_file_info = calloc(1, sizeof(SF_INFO));
-      // opts->audio_in_type = 1;
+      opts->audio_in_file_info->samplerate=opts->wav_sample_rate; 
-      // opts->audio_in_file_info = calloc(1, sizeof(SF_INFO));
+      opts->audio_in_file_info->channels=1; 
-      // opts->audio_in_file_info->channels = 1;
+      opts->audio_in_file_info->channels = 1;
-      // opts->audio_in_file = sf_open(opts->audio_in_dev, SFM_READ, opts->audio_in_file_info);
+      opts->audio_in_file_info->seekable=0;
+      opts->audio_in_file_info->format=SF_FORMAT_RAW|SF_FORMAT_PCM_16|SF_ENDIAN_LITTLE;
       //
-      // if(opts->audio_in_file == NULL)
+      opts->audio_in_file = sf_open(opts->audio_in_dev, SFM_READ, opts->audio_in_file_info);
-      //   {
+
-      //     fprintf (stderr,"Error, couldn't open file %s\n", opts->audio_in_dev);
+      if(opts->audio_in_file == NULL)
-      //     exit(1);
+      {
-      //   }
+        fprintf(stderr, "Error, couldn't open wav file %s\n", opts->audio_in_dev);
+        exit(1);
+      }
 
-      opts->symbolfile = fopen(opts->audio_in_dev, "r");
-      opts->audio_in_type = 4; //symbol capture bin files
     }
-  else
+    //open pulse audio if no bin or wav
+    else //seems this condition is never met
     {
-      // this is a device, use old handling, pulse audio now
+      //opts->audio_in_type = 5; //not sure if this works or needs to openPulse here
-      opts->audio_in_type = 0;
+      fprintf(stderr, "Error, couldn't open input file.\n");
-
+      exit(1);
     }
   }
-
   if (opts->split == 1)
     {
       fprintf (stderr,"Audio In Device: %s\n", opts->audio_in_dev);

src/dsd_dibit.c

@@ -118,6 +118,8 @@ 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;
@@ -217,16 +219,16 @@ invert_dibit(int dibit)
     return -1;
 }
 
-static int digitize (dsd_opts* opts, dsd_state* state, int symbol)
+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))
+  if ((state->synctype == 6) || (state->synctype == 14)|| (state->synctype == 18) || (state->synctype == 37))
 
     {
       //  6 +D-STAR
       // 14 +ProVoice
       // 18 +D-STAR_HD
+      // 37 +EDACS
 
       if (symbol > state->center)
         {
@@ -241,11 +243,12 @@ static int digitize (dsd_opts* opts, dsd_state* state, int symbol)
           return (1);               // +3
         }
     }
-  else if ((state->synctype == 7) || (state->synctype == 15)|| (state->synctype == 19))
+  else if ((state->synctype == 7) || (state->synctype == 15)|| (state->synctype == 19) || (state->synctype == 38))
     {
       //  7 -D-STAR
       // 15 -ProVoice
       // 19 -D-STAR_HD
+      // 38 -EDACS
 
       if (symbol > state->center)
         {
@@ -263,27 +266,36 @@ static 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 == 36) )
+          (state->synctype == 17) || (state->synctype == 29) || (state->synctype == 31) ||
+          (state->synctype == 36) || (state->synctype == 99)                              )
 
     {
       //  1 -P25p1
       //  3 -X2-TDMA (inverted signal voice frame)
       //  5 -X2-TDMA (inverted signal data frame)
-      //  9 -NXDN (inverted voice frame)
+      //  9 -M17 LSR
       // 11 -DMR (inverted signal voice frame)
       // 13 -DMR (inverted signal data frame)
-      // 17 -NXDN (inverted data frame)
+      // 17 -M17 STR
+      // 29 -NXDN (inverted FSW)
+      // 31 -YSF 
+      // 36 -P25p2 
+      // 99 -M17 Preamble
 
       int valid;
       int dibit;
 
       valid = 0;
 
-      if (state->synctype == 1)
+      UNUSED(opts);
-        {
+
-          // Use the P25 heuristics if available
+      //testing again, either on Voice channels only (when tuned) or with trunk disabled
-          valid = estimate_symbol(state->rf_mod, &(state->inv_p25_heuristics), state->last_dibit, symbol, &dibit);
+      // 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)
+      {
+        // Use the P25p1 heuristics if available
+        valid = estimate_symbol(state->rf_mod, &(state->inv_p25_heuristics), state->last_dibit, symbol, &dibit);
+      }
 
       if (valid == 0)
         {
@@ -330,21 +342,27 @@ static int digitize (dsd_opts* opts, dsd_state* state, int symbol)
       //  0 +P25p1
       //  2 +X2-TDMA (non inverted signal data frame)
       //  4 +X2-TDMA (non inverted signal voice frame)
-      //  8 +NXDN (non inverted voice frame)
+      //  8 +M17 LSF
       // 10 +DMR (non inverted signal data frame)
       // 12 +DMR (non inverted signal voice frame)
-      // 16 +NXDN (non inverted data frame)
+      // 16 +M17 STR
+      // 28 +NXND (FSW)
+      // 30 +YSF
+      // 35 +p25p2
+      // 98 +M17 Preamble
 
       int valid;
       int dibit;
 
       valid = 0;
 
-      if (state->synctype == 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)
-          // Use the P25 heuristics if available
+      if (state->synctype == 0 && opts->use_heuristics == 1)
-          valid = estimate_symbol(state->rf_mod, &(state->p25_heuristics), state->last_dibit, symbol, &dibit);
+      {
-        }
+        // Use the P25p1 heuristics if available
+        valid = estimate_symbol(state->rf_mod, &(state->p25_heuristics), state->last_dibit, symbol, &dibit);
+      }
 
       if (valid == 0)
         {
@@ -437,7 +455,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 == 1)
+  if (opts->symbol_out_f)
   {
     //fprintf (stderr, "%d", dibit);
     fputc (dibit, opts->symbol_out_f);
@@ -474,6 +492,7 @@ 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,36 +17,39 @@
 
 #include "dsd.h"
 
-time_t nowF;
+//fix from YorgosTheodorakis fork -- https://github.com/YorgosTheodorakis/dsd-fme/commit/7884ee555521a887d388152b3b1f11f20433a94b
-char * getTimeF(void) //get pretty hh:mm:ss timestamp
+char * getTimeF(void) //get pretty hhmmss timestamp
 {
+  char * curr = (char *) malloc(9);
   time_t t = time(NULL);
-
+  struct tm * ptm = localtime(& t);
-  char * curr;
+  sprintf(
-  char * stamp = asctime(localtime( & t));
+    curr,
-
+    "%02d%02d%02d",
-  curr = strtok(stamp, " ");
+    ptm->tm_hour,
-  curr = strtok(NULL, " ");
+    ptm->tm_min,
-  curr = strtok(NULL, " ");
+    ptm->tm_sec
-  curr = strtok(NULL, " ");
+  );
-
   return curr;
 }
 
 char * getDateF(void) {
-  char datename[120]; //bug in 32-bit Ubuntu when using date in filename, date is garbage text
+  #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);
+  strftime(datename, sizeof(datename), "%Y%m%d", to);
   curr2 = strtok(datename, " ");
   return curr2;
 }
 
-void
+void saveImbe4400Data (dsd_opts * opts, dsd_state * state, char *imbe_d)
-saveImbe4400Data (dsd_opts * opts, dsd_state * state, char *imbe_d)
 {
   int i, j, k;
   unsigned char b;
@@ -56,36 +59,22 @@ saveImbe4400Data (dsd_opts * opts, dsd_state * state, char *imbe_d)
   fputc (err, opts->mbe_out_f);
 
   k = 0;
-  if (opts->payload == 1) //make opt variable later on to toggle this
-  {
-    //fprintf(stderr, "\n IMBE ");
-  }
-
   for (i = 0; i < 11; i++)
-    {
+  {
-      b = 0;
+    b = 0;
 
-      for (j = 0; j < 8; j++)
+    for (j = 0; j < 8; j++)
-        {
+      {
-          b = b << 1;
+        b = b << 1;
-          b = b + imbe_d[k];
+        b = b + imbe_d[k];
-          k++;
+        k++;
-        }
+      }
-        if (opts->payload == 1) //make opt variable later on to toggle this
+    fputc (b, opts->mbe_out_f);
-        {
+  }
-          //fprintf (stderr, "%02X", b);
-        }
-      fputc (b, opts->mbe_out_f);
-    }
-    if (opts->payload == 1)
-    {
-      //fprintf(stderr, " err = [%X] [%X] ", state->errs, state->errs2);
-    }
   fflush (opts->mbe_out_f);
 }
 
-void
+void saveAmbe2450Data (dsd_opts * opts, dsd_state * state, char *ambe_d)
-saveAmbe2450Data (dsd_opts * opts, dsd_state * state, char *ambe_d)
 {
   int i, j, k;
   unsigned char b;
@@ -95,47 +84,55 @@ saveAmbe2450Data (dsd_opts * opts, dsd_state * state, char *ambe_d)
   fputc (err, opts->mbe_out_f);
 
   k = 0;
-  if (opts->payload == 1) //make opt variable later on to toggle this
+  for (i = 0; i < 6; i++) 
   {
-    //fprintf(stderr, "\n AMBE ");
+    b = 0;
+    for (j = 0; j < 8; j++)
+    {
+      b = b << 1;
+      b = b + ambe_d[k];
+      k++;
+    }
+    fputc (b, opts->mbe_out_f);
   }
-  //for (i = 0; i < 6; i++)
-  for (i = 0; i < 6; i++) //using 7 seems to break older amb files where it was 6, need to test 7 on 7 some more
-    {
-      b = 0;
-      for (j = 0; j < 8; j++)
-        {
-          b = b << 1;
-          b = b + ambe_d[k];
-          k++;
-        }
-        if (opts->payload == 1 && i < 6) //make opt variable later on to toggle this
-        {
-          //fprintf (stderr, "%02X", b);
-        }
-        if (opts->payload == 1 && i == 6) //7th octet should only contain 1 bit? value will be either 0x00 or 0x80?
-        {
-          //fprintf (stderr, "%02X", b & 0x80); //7th octet should only contain 1 bit?
-        }
-
-      fputc (b, opts->mbe_out_f);
-    }
-    if (opts->payload == 1)
-    {
-      //fprintf(stderr, " err = [%X] [%X] ", state->errs, state->errs2);
-    }
   b = ambe_d[48];
   fputc (b, opts->mbe_out_f);
   fflush (opts->mbe_out_f);
 }
 
-void
+void saveAmbe2450DataR (dsd_opts * opts, dsd_state * state, char *ambe_d)
-PrintIMBEData (dsd_opts * opts, dsd_state * state, char *imbe_d) //for P25P1 and ProVoice
 {
   int i, j, k;
   unsigned char b;
   unsigned char err;
 
+  err = (unsigned char) state->errs2R;
+  fputc (err, opts->mbe_out_fR);
+
+  k = 0;
+  for (i = 0; i < 6; i++) 
+  {
+    b = 0;
+    for (j = 0; j < 8; j++)
+    {
+      b = b << 1;
+      b = b + ambe_d[k];
+      k++;
+    }
+    fputc (b, opts->mbe_out_fR);
+  }
+  b = ambe_d[48];
+  fputc (b, opts->mbe_out_fR);
+  fflush (opts->mbe_out_fR);
+}
+
+void PrintIMBEData (dsd_opts * opts, dsd_state * state, char *imbe_d) //for P25P1 and ProVoice
+{
+  int i, j, k;
+  unsigned char b;
+  unsigned char err;
+  UNUSED(err);
+
   err = (unsigned char) state->errs2;
   k = 0;
   if (opts->payload == 1) //print IMBE info
@@ -165,16 +162,16 @@ PrintIMBEData (dsd_opts * opts, dsd_state * state, char *imbe_d) //for P25P1 and
   //fprintf (stderr, "\n");
 }
 
-void
+void PrintAMBEData (dsd_opts * opts, dsd_state * state, char *ambe_d) 
-PrintAMBEData (dsd_opts * opts, dsd_state * state, char *ambe_d) //For DMR Stereo, may use this for NXDN too
 {
   int i, j, k;
   unsigned char b;
   unsigned char err;
+  UNUSED(err);
 
   err = (unsigned char) state->errs2;
   k = 0;
-  if (opts->dmr_stereo == 0)
+  if (opts->dmr_stereo == 0 && opts->dmr_mono == 0)
   {
     fprintf (stderr, "\n");
   }
@@ -183,7 +180,7 @@ PrintAMBEData (dsd_opts * opts, dsd_state * state, char *ambe_d) //For DMR Stere
     fprintf(stderr, " AMBE ");
   }
 
-  for (i = 0; i < 7; i++) //using 7 seems to break older amb files where it was 6, need to test 7 on 7 some more
+  for (i = 0; i < 7; i++) 
     {
       b = 0;
       for (j = 0; j < 8; j++)
@@ -192,13 +189,13 @@ PrintAMBEData (dsd_opts * opts, dsd_state * state, char *ambe_d) //For DMR Stere
           b = b + ambe_d[k];
           k++;
         }
-        if (opts->payload == 1 && i < 6) //make opt variable later on to toggle this
+        if (opts->payload == 1 && i < 6) 
         {
           fprintf (stderr, "%02X", b);
         }
-        if (opts->payload == 1 && i == 6) //7th octet should only contain 1 bit, value will be either 0x00 or 0x80?
+        if (opts->payload == 1 && i == 6) 
         {
-          fprintf (stderr, "%02X", b & 0x80); //7th octet should only contain 1 bit
+          fprintf (stderr, "%02X", b & 0x80); 
         }
     }
     if (state->currentslot == 0)
@@ -207,7 +204,7 @@ PrintAMBEData (dsd_opts * opts, dsd_state * state, char *ambe_d) //For DMR Stere
     }
     else fprintf(stderr, " err = [%X] [%X] ", state->errsR, state->errs2R);
   b = ambe_d[48];
-  if (opts->dmr_stereo == 1) //need to fix the printouts again
+  if (opts->dmr_stereo == 1 || opts->dmr_mono == 1) //need to fix the printouts again
   {
     fprintf (stderr, "\n");
   }
@@ -226,7 +223,7 @@ readImbe4400Data (dsd_opts * opts, dsd_state * state, char *imbe_d)
 
 
   k = 0;
-  if (opts->payload == 1) //make opt variable later on to toggle this
+  if (opts->payload == 1) 
   {
     fprintf(stderr, "\n");
   }
@@ -248,12 +245,12 @@ readImbe4400Data (dsd_opts * opts, dsd_state * state, char *imbe_d)
           b = b & 255;
           k++;
         }
-        //new printout on reading MBE files back in
+        
-        if (opts->payload == 1) //make opt variable later on to toggle this
+        if (opts->payload == 1) 
         {
           fprintf (stderr, "%02X", x);
         }
-        //
+        
     }
     if (opts->payload == 1)
     {
@@ -273,11 +270,11 @@ readAmbe2450Data (dsd_opts * opts, dsd_state * state, char *ambe_d)
   state->errs = state->errs2;
 
   k = 0;
-  if (opts->payload == 1) //make opt variable later on to toggle this
+  if (opts->payload == 1) 
   {
     fprintf(stderr, "\n");
   }
-  //for (i = 0; i < 6; i++)
+
   for (i = 0; i < 6; i++) //breaks backwards compatablilty with 6 files
     {
       b = fgetc (opts->mbe_in_f);
@@ -296,13 +293,13 @@ readAmbe2450Data (dsd_opts * opts, dsd_state * state, char *ambe_d)
           b = b & 255;
           k++;
         }
-        if (opts->payload == 1 && i < 6) //make opt variable later on to toggle this
+        if (opts->payload == 1 && i < 6) 
         {
           fprintf (stderr, "%02X", x);
         }
-        if (opts->payload == 1 && i == 6) //7th octet should only contain 1 bit? value will be either 0x00 or 0x80?
+        if (opts->payload == 1 && i == 6) 
         {
-          fprintf (stderr, "%02X", x & 0x80); //7th octet should only contain 1 bit?
+          fprintf (stderr, "%02X", x & 0x80); 
         }
     }
     if (opts->payload == 1)
@@ -333,14 +330,21 @@ openMbeInFile (dsd_opts * opts, dsd_state * state)
   cookie[2] = fgetc (opts->mbe_in_f);
   cookie[3] = fgetc (opts->mbe_in_f);
   cookie[4] = 0;
+  //ambe+2
   if (strstr (cookie, ".amb") != NULL)
-    {
+  {
-      state->mbe_file_type = 1;
+    state->mbe_file_type = 1;
-    }
+  }
+  //p1 and pv
   else if (strstr (cookie, ".imb") != NULL)
-    {
+  {
-      state->mbe_file_type = 0;
+    state->mbe_file_type = 0;
-    }
+  }
+  //d-star ambe
+  else if (strstr (cookie, ".dmb") != NULL)
+  {
+    state->mbe_file_type = 2;
+  }
   else
     {
       state->mbe_file_type = -1;
@@ -349,85 +353,11 @@ openMbeInFile (dsd_opts * opts, dsd_state * state)
 
 }
 
-//temporarily disabled until the compiler warnings can be fixed, use symbol capture  or per call instead!
+//slot 1
-//probably the easiest thing is to just have this run fclose, and have name assignment on open instead.
-// void
-// closeMbeOutFile (dsd_opts * opts, dsd_state * state)
-// {
-//
-//   char shell[255], newfilename[64], ext[5], datestr[32], new_path[1024];
-//   char tgid[17];
-//   int sum, i, j;
-//   int talkgroup;
-//   struct tm timep;
-//   int result;
-//
-//   if (opts->mbe_out_f != NULL)
-//     {
-//       if ((state->synctype == 0) || (state->synctype == 1) || (state->synctype == 14) || (state->synctype == 15))
-//         {
-//           sprintf (ext, ".imb");
-//           //strptime (opts->mbe_out_file, "%s.imb", &timep);
-//         }
-//       else
-//         {
-//           sprintf (ext, ".amb");
-//           //strptime (opts->mbe_out_file, "%s.amb", &timep);
-//         }
-//
-//       if (state->tgcount > 0)
-//         {
-//           for (i = 0; i < 16; i++)
-//             {
-//               sum = 0;
-//               for (j = 0; j < state->tgcount; j++)
-//                 {
-//                   sum = sum + state->tg[j][i] - 48;
-//                 }
-//               tgid[i] = (char) (((float) sum / (float) state->tgcount) + 48.5);
-//             }
-//           tgid[16] = 0;
-//           talkgroup = (int) strtol (tgid, NULL, 2);
-//         }
-//       else
-//         {
-//           talkgroup = 0;
-//         }
-//
-//       fflush (opts->mbe_out_f);
-//       fclose (opts->mbe_out_f);
-//       opts->mbe_out_f = NULL;
-//       strftime (datestr, 31, "%Y-%m-%d-%H%M%S", &timep);
-//
-//       sprintf (newfilename, "%s%s", datestr, ext); //this one
-//
-//       if (state->lastsynctype == 0 || state->lastsynctype == 1)
-//       {
-//         sprintf (newfilename, "%s-nac%X-tg%i%s", datestr, state->nac, talkgroup, ext);
-//       }
-//
-//       //sprintf (new_path, "%s%s", opts->mbe_out_dir, newfilename);
-// #ifdef _WIN32
-//       //sprintf (shell, "move %s %s", opts->mbe_out_path, new_path);
-// #else
-//       //sprintf (shell, "mv %s %s", opts->mbe_out_path, new_path);
-// #endif
-//       //result = system (shell);
-//
-//       state->tgcount = 0;
-//       for (i = 0; i < 25; i++)
-//         {
-//           for (j = 0; j < 16; j++)
-//             {
-//               state->tg[i][j] = 48;
-//             }
-//         }
-//     }
-// }
-
-//much simpler version
 void closeMbeOutFile (dsd_opts * opts, dsd_state * state)
 {
+  UNUSED(state);
+
   if (opts->mbe_out == 1)
   {
     if (opts->mbe_out_f != NULL)
@@ -436,53 +366,69 @@ void closeMbeOutFile (dsd_opts * opts, dsd_state * state)
       fclose (opts->mbe_out_f);
       opts->mbe_out_f = NULL;
       opts->mbe_out = 0;
-      fprintf (stderr, "\nClosing MBE out file.");
+      fprintf (stderr, "\nClosing MBE out file 1.\n");
     }
 
   }
-
 }
 
-void
+//slot 2
-openMbeOutFile (dsd_opts * opts, dsd_state * state)
+void closeMbeOutFileR (dsd_opts * opts, dsd_state * state)
+{
+  UNUSED(state);
+
+  if (opts->mbe_outR == 1)
+  {
+    if (opts->mbe_out_fR != NULL)
+    {
+      fflush (opts->mbe_out_fR);
+      fclose (opts->mbe_out_fR);
+      opts->mbe_out_fR = NULL;
+      opts->mbe_outR = 0;
+      fprintf (stderr, "\nClosing MBE out file 2.\n");
+    }
+
+  }
+}
+
+void openMbeOutFile (dsd_opts * opts, dsd_state * state)
 {
 
-  //struct timeval tv;
   int i, j;
   char ext[5];
 
-  if ((state->synctype == 0) || (state->synctype == 1) || (state->synctype == 14) || (state->synctype == 15))
+  //phase 1 and provoice
-    {
+  if ( (state->synctype == 0) || (state->synctype == 1) || (state->synctype == 14) || (state->synctype == 15) )
-      sprintf (ext, ".imb");
+  {
-    }
+    sprintf (ext, ".imb");
-  else
+  }
-    {
+  //d-star
-      sprintf (ext, ".amb");
+  else if ( (state->synctype == 6) || (state->synctype == 7) || (state->synctype == 18) || (state->synctype == 19) )
-    }
+  {
+    sprintf (ext, ".dmb"); //new dstar file extension to make it read in and process properly
+  }
+  //dmr, nxdn, phase 2, x2-tdma
+  else sprintf (ext, ".amb"); 
 
-  //  reset talkgroup id buffer
+  //reset talkgroup id buffer
   for (i = 0; i < 12; i++)
+  {
+    for (j = 0; j < 25; j++)
     {
-      for (j = 0; j < 25; j++)
+      state->tg[j][i] = 0;
-        {
-          state->tg[j][i] = 0;
-        }
     }
+  }
 
   state->tgcount = 0;
 
-  //gettimeofday (&tv, NULL);
+  sprintf (opts->mbe_out_file, "%s %s S1%s", getDateF(), getTimeF(), ext);
-  //rewrite below line to take getTime function instead?
-  // sprintf (opts->mbe_out_file, "%i%s", (int) tv.tv_sec, ext);
-
-  sprintf (opts->mbe_out_file, "%s %s%s", getDateF(), getTimeF(), ext);
 
   sprintf (opts->mbe_out_path, "%s%s", opts->mbe_out_dir, opts->mbe_out_file);
 
   opts->mbe_out_f = fopen (opts->mbe_out_path, "w");
   if (opts->mbe_out_f == NULL)
   {
-    fprintf (stderr,"Error, couldn't open %s\n", opts->mbe_out_path);
+    fprintf (stderr,"\nError, couldn't open %s for slot 1\n", opts->mbe_out_path);
   }
   else opts->mbe_out = 1;
 
@@ -492,15 +438,61 @@ openMbeOutFile (dsd_opts * opts, dsd_state * state)
   fflush (opts->mbe_out_f);
 }
 
-void
+void openMbeOutFileR (dsd_opts * opts, dsd_state * state)
-openWavOutFile (dsd_opts * opts, dsd_state * state)
 {
 
+  int i, j;
+  char ext[5];
+
+  //phase 1 and provoice
+  if ( (state->synctype == 0) || (state->synctype == 1) || (state->synctype == 14) || (state->synctype == 15) )
+  {
+    sprintf (ext, ".imb");
+  }
+  //d-star
+  else if ( (state->synctype == 6) || (state->synctype == 7) || (state->synctype == 18) || (state->synctype == 19) )
+  {
+    sprintf (ext, ".dmb"); //new dstar file extension to make it read in and process properly
+  }
+  //dmr, nxdn, phase 2, x2-tdma
+  else sprintf (ext, ".amb"); 
+
+  //reset talkgroup id buffer
+  for (i = 0; i < 12; i++)
+  {
+    for (j = 0; j < 25; j++)
+    {
+      state->tg[j][i] = 0;
+    }
+  }
+
+  state->tgcount = 0;
+
+  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);
+
+  opts->mbe_out_fR = fopen (opts->mbe_out_path, "w");
+  if (opts->mbe_out_fR == NULL)
+  {
+    fprintf (stderr,"\nError, couldn't open %s for slot 2\n", opts->mbe_out_path);
+  }
+  else opts->mbe_outR = 1;
+
+  //
+  fprintf (opts->mbe_out_fR, "%s", ext);
+
+  fflush (opts->mbe_out_fR);
+}
+
+void openWavOutFile (dsd_opts * opts, dsd_state * state)
+{
+  UNUSED(state);
+
   SF_INFO info;
   info.samplerate = 8000; //8000
   info.channels = 1;
   info.format = SF_FORMAT_WAV | SF_FORMAT_PCM_16 | SF_ENDIAN_LITTLE;
-  //opts->wav_out_f = sf_open (opts->wav_out_file, SFM_WRITE, &info);
   opts->wav_out_f = sf_open (opts->wav_out_file, SFM_RDWR, &info); //RDWR will append to file instead of overwrite file
 
   if (opts->wav_out_f == NULL)
@@ -508,18 +500,16 @@ openWavOutFile (dsd_opts * opts, dsd_state * state)
     fprintf (stderr,"Error - could not open wav output file %s\n", opts->wav_out_file);
     return;
   }
-
-//  state->wav_out_bytes = 0;
-
 }
+
 void openWavOutFileL (dsd_opts * opts, dsd_state * state)
 {
+  UNUSED(state);
 
   SF_INFO info;
-  info.samplerate = 8000; //8000
+  info.samplerate = 8000; 
   info.channels = 1;
   info.format = SF_FORMAT_WAV | SF_FORMAT_PCM_16 | SF_ENDIAN_LITTLE;
-  //opts->wav_out_f = sf_open (opts->wav_out_file, SFM_WRITE, &info);
   opts->wav_out_f = sf_open (opts->wav_out_file, SFM_RDWR, &info); //RDWR will append to file instead of overwrite file
 
   if (opts->wav_out_f == NULL)
@@ -527,19 +517,16 @@ void openWavOutFileL (dsd_opts * opts, dsd_state * state)
     fprintf (stderr,"Error - could not open wav output file %s\n", opts->wav_out_file);
     return;
   }
-
-//  state->wav_out_bytes = 0;
-
 }
 
 void openWavOutFileR (dsd_opts * opts, dsd_state * state)
 {
+  UNUSED(state);
 
   SF_INFO info;
   info.samplerate = 8000; //8000
   info.channels = 1;
   info.format = SF_FORMAT_WAV | SF_FORMAT_PCM_16 | SF_ENDIAN_LITTLE;
-  //opts->wav_out_f = sf_open (opts->wav_out_file, SFM_WRITE, &info);
   opts->wav_out_fR = sf_open (opts->wav_out_fileR, SFM_RDWR, &info); //RDWR will append to file instead of overwrite file
 
   if (opts->wav_out_f == NULL)
@@ -547,78 +534,65 @@ void openWavOutFileR (dsd_opts * opts, dsd_state * state)
     fprintf (stderr,"Error - could not open wav output file %s\n", opts->wav_out_fileR);
     return;
   }
-
-//  state->wav_out_bytes = 0;
-
 }
 
 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_f = sf_open (opts->wav_out_file, SFM_WRITE, &info);
+  opts->wav_out_raw = sf_open (opts->wav_out_file_raw, SFM_WRITE, &info);
-  //opts->wav_out_f = sf_open (opts->wav_out_file, SFM_RDWR, &info); //RDWR will append to file instead of overwrite file
-  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);
     return;
   }
-
-//  state->wav_out_bytes = 0;
-
 }
 
 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)
 {
-  //Do something
+  closeSymbolOutFile(opts, state);
   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)
 {
-  //Do something
+  UNUSED(state);
-  if (opts->symbol_out == 1)
+
+  if (opts->symbol_out_f)
   {
-    if (opts->symbol_out_file != NULL) //check first, or issuing a second fclose will crash the SOFTWARE
+    fclose(opts->symbol_out_f);
-    {
+    opts->symbol_out_f = NULL;
-      fclose(opts->symbol_out_f); //free(): double free detected in tcache 2 (this is a new one) happens when closing more than once
-      //noCarrier(opts, state); //free(): double free detected in tcache 2 (this is a new one)
-    }
-
-    opts->symbol_out = 0; //set flag to 1
-    //sprintf (opts->symbol_out_file, "fme-capture.bin"); //use fme for the symbol bin ext
-    //openSymbolOutFile (opts, state);
-
   }
-
 }

src/dsd_filters.c

@@ -1,8 +1,36 @@
-// DMR filter
+//M17 Filter -- RRC Alpha = 0.5 S/s 48000 with 81 taps
+#define M17ZEROS 80 //ONLY SEE 79 THOUGH
+float m17gain = 10.0f;
+static float m17xv[M17ZEROS+1];
+float m17coeffs[81] =
+{
+-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
 #define NZEROS 60
 float ngain = 7.423339364f;
 static float xv[NZEROS+1];
-float xcoeffs[] =
+float xcoeffs[61] =
 { -0.0083649323f, -0.0265444850f, -0.0428141462f, -0.0537571943f,
 -0.0564141052f, -0.0489161045f, -0.0310068662f, -0.0043393881f,
 +0.0275375106f, +0.0595423283f, +0.0857543325f, +0.1003565948f,
@@ -21,70 +49,48 @@ float xcoeffs[] =
 -0.0083649323f,
 };
 
-// NXDN48 filter
+//reverted to original NXDN filters, do better with LICH/Data handling
-//#define NXZEROS 134
+// NXDN48 filter - Original Version
-//float nxgain = 15.95930463f; 
+#define NXZEROS 134
-
+float nxgain = 15.95930463f; 
-#define NXZEROS 91 //Osmocom OP25
-float nxgain = 1.0f; //Osmocom OP25
-
 static float nxv[NXZEROS+1];
 
-//OP25 Osmocom NXDN48 Coeffs seem to do well, will want to do some VS testing
+float nxcoeffs[135] =
-float nxcoeffs[] =
+{ +0.031462429f, +0.031747267f, +0.030401148f, +0.027362877f,
-{ 0.00203767f,  0.00491622f,  0.00748189f,  0.00934561f,  0.01017049f,  0.00972167f,
++0.022653298f, +0.016379869f, +0.008737200f, +0.000003302f,
-  0.00790748f,  0.00480597f,  0.00067202f, -0.00407743f, -0.00890019f, -0.01318478f,
+-0.009468531f, -0.019262057f, -0.028914291f, -0.037935027f,
- -0.01632047f, -0.01777371f, -0.01716241f, -0.01431852f, -0.00933066f, -0.00255979f,
+-0.045828927f, -0.052119261f, -0.056372283f, -0.058221106f,
-  0.00537624f,  0.01364992f,  0.02130038f,  0.02733235f,  0.03082824f,  0.03106179f,
+-0.057387924f, -0.053703443f, -0.047122444f, -0.037734535f,
-  0.02760061f,  0.02038545f,  0.00977572f, -0.0034462f,  -0.01811514f, -0.03276675f,
+-0.025769308f, -0.011595336f, +0.004287292f, +0.021260954f,
- -0.04575844f, -0.05541762f, -0.06020353f, -0.0588669f,  -0.05059129f, -0.03510097f,
++0.038610717f, +0.055550276f, +0.071252765f, +0.084885375f,
- -0.01272309f,  0.01560398f,  0.04837926f,  0.08364189f,  0.11912012f,  0.15241359f,
++0.095646450f, +0.102803611f, +0.105731303f, +0.103946126f,
-  0.18119246f,  0.20339503f,  0.21740525f,  0.2221932f,   0.21740525f,  0.20339503f,
++0.097138329f, +0.085197939f, +0.068234131f, +0.046586711f,
-  0.18119246f,  0.15241359f,  0.11912012f,  0.08364189f,  0.04837926f,  0.01560398f,
++0.020828821f, -0.008239664f, -0.039608255f, -0.072081234f,
- -0.01272309f, -0.03510097f, -0.05059129f, -0.0588669f,  -0.06020353f, -0.05541762f,
+-0.104311776f, -0.134843790f, -0.162160200f, -0.184736015f,
- -0.04575844f, -0.03276675f, -0.01811514f, -0.0034462f,   0.00977572f,  0.02038545f,
+-0.201094346f, -0.209863285f, -0.209831516f, -0.200000470f,
-  0.02760061f,  0.03106179f,  0.03082824f,  0.02733235f,  0.02130038f,  0.01364992f,
+-0.179630919f, -0.148282051f, -0.105841323f, -0.052543664f,
-  0.00537624f, -0.00255979f, -0.00933066f, -0.01431852f, -0.01716241f, -0.01777371f,
++0.011020985f, +0.083912428f, +0.164857408f, +0.252278939f,
- -0.01632047f, -0.01318478f, -0.00890019f, -0.00407743f,  0.00067202f,  0.00480597f,
++0.344336996f, +0.438979335f, +0.534000832f, +0.627109358f,
-  0.00790748f,  0.00972167f,  0.01017049f,  0.00934561f,  0.00748189f,  0.00491622f,
++0.715995947f, +0.798406824f, +0.872214756f, +0.935487176f,
-  0.00203767f};
++0.986548646f, +1.024035395f, +1.046939951f, +1.054644241f,
-
++1.046939951f, +1.024035395f, +0.986548646f, +0.935487176f,
-//OLD nxCOEFFS
++0.872214756f, +0.798406824f, +0.715995947f, +0.627109358f,
-// { +0.031462429f, +0.031747267f, +0.030401148f, +0.027362877f,
++0.534000832f, +0.438979335f, +0.344336996f, +0.252278939f,
-// +0.022653298f, +0.016379869f, +0.008737200f, +0.000003302f,
++0.164857408f, +0.083912428f, +0.011020985f, -0.052543664f,
-// -0.009468531f, -0.019262057f, -0.028914291f, -0.037935027f,
+-0.105841323f, -0.148282051f, -0.179630919f, -0.200000470f,
-// -0.045828927f, -0.052119261f, -0.056372283f, -0.058221106f,
+-0.209831516f, -0.209863285f, -0.201094346f, -0.184736015f,
-// -0.057387924f, -0.053703443f, -0.047122444f, -0.037734535f,
+-0.162160200f, -0.134843790f, -0.104311776f, -0.072081234f,
-// -0.025769308f, -0.011595336f, +0.004287292f, +0.021260954f,
+-0.039608255f, -0.008239664f, +0.020828821f, +0.046586711f,
-// +0.038610717f, +0.055550276f, +0.071252765f, +0.084885375f,
++0.068234131f, +0.085197939f, +0.097138329f, +0.103946126f,
-// +0.095646450f, +0.102803611f, +0.105731303f, +0.103946126f,
++0.105731303f, +0.102803611f, +0.095646450f, +0.084885375f,
-// +0.097138329f, +0.085197939f, +0.068234131f, +0.046586711f,
++0.071252765f, +0.055550276f, +0.038610717f, +0.021260954f,
-// +0.020828821f, -0.008239664f, -0.039608255f, -0.072081234f,
++0.004287292f, -0.011595336f, -0.025769308f, -0.037734535f,
-// -0.104311776f, -0.134843790f, -0.162160200f, -0.184736015f,
+-0.047122444f, -0.053703443f, -0.057387924f, -0.058221106f,
-// -0.201094346f, -0.209863285f, -0.209831516f, -0.200000470f,
+-0.056372283f, -0.052119261f, -0.045828927f, -0.037935027f,
-// -0.179630919f, -0.148282051f, -0.105841323f, -0.052543664f,
+-0.028914291f, -0.019262057f, -0.009468531f, +0.000003302f,
-// +0.011020985f, +0.083912428f, +0.164857408f, +0.252278939f,
++0.008737200f, +0.016379869f, +0.022653298f, +0.027362877f,
-// +0.344336996f, +0.438979335f, +0.534000832f, +0.627109358f,
++0.030401148f, +0.031747267f, +0.031462429f,
-// +0.715995947f, +0.798406824f, +0.872214756f, +0.935487176f,
+};
-// +0.986548646f, +1.024035395f, +1.046939951f, +1.054644241f,
-// +1.046939951f, +1.024035395f, +0.986548646f, +0.935487176f,
-// +0.872214756f, +0.798406824f, +0.715995947f, +0.627109358f,
-// +0.534000832f, +0.438979335f, +0.344336996f, +0.252278939f,
-// +0.164857408f, +0.083912428f, +0.011020985f, -0.052543664f,
-// -0.105841323f, -0.148282051f, -0.179630919f, -0.200000470f,
-// -0.209831516f, -0.209863285f, -0.201094346f, -0.184736015f,
-// -0.162160200f, -0.134843790f, -0.104311776f, -0.072081234f,
-// -0.039608255f, -0.008239664f, +0.020828821f, +0.046586711f,
-// +0.068234131f, +0.085197939f, +0.097138329f, +0.103946126f,
-// +0.105731303f, +0.102803611f, +0.095646450f, +0.084885375f,
-// +0.071252765f, +0.055550276f, +0.038610717f, +0.021260954f,
-// +0.004287292f, -0.011595336f, -0.025769308f, -0.037734535f,
-// -0.047122444f, -0.053703443f, -0.057387924f, -0.058221106f,
-// -0.056372283f, -0.052119261f, -0.045828927f, -0.037935027f,
-// -0.028914291f, -0.019262057f, -0.009468531f, +0.000003302f,
-// +0.008737200f, +0.016379869f, +0.022653298f, +0.027362877f,
-// +0.030401148f, +0.031747267f, +0.031462429f,
-// };
 
 // DMR filter F4EXB
 #define DMRNZEROS 60
@@ -96,7 +102,7 @@ const float dmrgain = 6.82973073748f;
 static float dxv[DMRNZEROS+1];
 
 // DMR filter F4EXB - root raised cosine alpha=0.7 Ts = 6650 S/s Fc = 48kHz
-const float dmrcoeffs[] =
+const float dmrcoeffs[61] =
 {0.0301506278, 0.0269200615, 0.0159662432, -0.0013114705, -0.0216605133, 
 -0.0404938748, -0.0528141756, -0.0543747957, -0.0428325003, -0.0186176083, 
 0.0147202645, 0.0508418571, 0.0816392577, 0.0988113688, 0.0957187780, 
@@ -110,6 +116,52 @@ const float dmrcoeffs[] =
 0.0147202645, -0.0186176083, -0.0428325003, -0.0543747957, -0.0528141756, 
 -0.0404938748, -0.0216605133, -0.0013114705, 0.0159662432, 0.0269200615, 0.0301506278};
 
+// dPMR filter, version of F4EXB
+static float dpmrxv[NXZEROS+1];
+
+// dPMR filter, version of F4EXB
+#define DPMRNZEROS 134
+
+// dPMR filter, version of F4EXB
+const float dpmrgain = 14.6083498224f;
+
+// dPMR filter - root raised cosine alpha=0.2 Ts = 3325 S/s Fc = 48 kHz - zero at boundaries appears to be slightly better
+const float dpmrcoeffs[135] =
+{-0.0000983004, 0.0058388841,  0.0119748846,  0.0179185547, 0.0232592816,
+ 0.0275919612,  0.0305433586,  0.0317982965,  0.0311240307,
+ 0.0283911865,  0.0235897433,  0.0168387650,  0.0083888763,
+-0.0013831396, -0.0119878087, -0.0228442151, -0.0333082708,
+-0.0427067804, -0.0503756642, -0.0557003599, -0.0581561791,
+-0.0573462646, -0.0530347941, -0.0451732069, -0.0339174991,
+-0.0196350217, -0.0028997157,  0.0155246961,  0.0347134030,
+ 0.0536202583,  0.0711271166,  0.0861006725,  0.0974542022,
+ 0.1042112035,  0.1055676660,  0.1009496091,  0.0900625944,
+ 0.0729301774,  0.0499186839,  0.0217462748, -0.0105250265,
+-0.0455148664, -0.0815673067, -0.1168095612, -0.1492246435,
+-0.1767350726, -0.1972941202, -0.2089805758, -0.2100926829,
+-0.1992367833, -0.1754063031, -0.1380470370, -0.0871052089,
+-0.0230554989,  0.0530929052,  0.1398131936,  0.2351006721,
+ 0.3365341927,  0.4413570929,  0.5465745033,  0.6490630781,
+ 0.7456885564,  0.8334261381,  0.9094784589,  0.9713859928,
+ 1.0171250045,  1.0451886943,  1.0546479089,  1.0451886943,
+ 1.0171250045,  0.9713859928,  0.9094784589,  0.8334261381,
+ 0.7456885564,  0.6490630781,  0.5465745033,  0.4413570929,
+ 0.3365341927,  0.2351006721,  0.1398131936,  0.0530929052,
+-0.0230554989, -0.0871052089, -0.1380470370, -0.1754063031,
+-0.1992367833, -0.2100926829, -0.2089805758, -0.1972941202,
+-0.1767350726, -0.1492246435, -0.1168095612, -0.0815673067,
+-0.0455148664, -0.0105250265,  0.0217462748,  0.0499186839,
+ 0.0729301774,  0.0900625944,  0.1009496091,  0.1055676660,
+ 0.1042112035,  0.0974542022,  0.0861006725,  0.0711271166,
+ 0.0536202583,  0.0347134030,  0.0155246961, -0.0028997157,
+-0.0196350217, -0.0339174991, -0.0451732069, -0.0530347941,
+-0.0573462646, -0.0581561791, -0.0557003599, -0.0503756642,
+-0.0427067804, -0.0333082708, -0.0228442151, -0.0119878087,
+-0.0013831396,  0.0083888763,  0.0168387650,  0.0235897433,
+ 0.0283911865,  0.0311240307,  0.0317982965,  0.0305433586,
+ 0.0275919612,  0.0232592816,  0.0179185547,  0.0119748846,
+ 0.0058388841, -0.0000983004};
+
 
 
 short dsd_input_filter(short sample, int mode);
@@ -123,7 +175,18 @@ dmr_filter(short sample)
 short
 nxdn_filter(short sample)
 {
-    return dsd_input_filter(sample, 2);
+    return dsd_input_filter(sample, 4);
+}
+
+short
+dpmr_filter(short sample)
+{
+    return dsd_input_filter(sample, 4); 
+}
+
+short m17_filter (short sample)
+{
+  return dsd_input_filter(sample, 5);
 }
 
 
@@ -144,7 +207,7 @@ dsd_input_filter(short sample, int mode)
     case 2:
       gain = nxgain;
       v = nxv;
-      coeffs = nxcoeffs;
+      coeffs = (float *)nxcoeffs;
       zeros = NXZEROS;
       break;
     case 3:
@@ -153,6 +216,20 @@ dsd_input_filter(short sample, int mode)
         coeffs = (float *)dmrcoeffs;
         zeros = DMRNZEROS;
         break;
+    case 4:
+        gain = dpmrgain;
+        v = dpmrxv;
+        coeffs = (float *)dpmrcoeffs;
+        zeros = DPMRNZEROS;
+        break;
+
+    case 5:
+      gain = m17gain;
+      v = m17xv;
+      coeffs = (float *)m17coeffs;
+      zeros = M17ZEROS;
+      break;
+
     default:
       return sample;
   }
@@ -160,7 +237,7 @@ dsd_input_filter(short sample, int mode)
   for (i = 0; i < zeros; i++)
       v[i] = v[i+1];
 
-  v[zeros] = sample; // unfiltered sample in
+  v[zeros] = (float)sample; // unfiltered sample in
   sum = 0.0f;
 
   for (i = 0; i <= zeros; i++)

src/dsd_frame.c

@@ -31,7 +31,8 @@ printFrameInfo (dsd_opts * opts, dsd_state * state)
   level = (int) state->max / 164;
   if (opts->verbose > 0)
     {
-      //fprintf (stderr,"inlvl: %2i%% ", level);
+      // fprintf (stderr,"inlvl: %2i%% ", level);
+      UNUSED(level);
     }
   if (state->nac != 0)
     {
@@ -59,8 +60,10 @@ 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;
@@ -84,184 +87,133 @@ processFrame (dsd_opts * opts, dsd_state * state)
       state->minref = state->min;
     }
 
-  if ((state->synctype == 8) || (state->synctype == 9)) //NXDN Voice
+  //NXDN FSW
-    {
+  if ((state->synctype == 28) || (state->synctype == 29))
-      //state->rf_mod = 2; //wrong type of modulation HERE HERE
+  {
-      state->nac = 0;
+    //MBEout restored, is not handled internally by nxdn_frame.c
-      state->lastsrc = 0;
+    nxdn_frame (opts, state); 
-      state->lasttg = 0;
+    return;
-      if (opts->errorbars == 1)
+  }
-        {
+
-          if (opts->verbose > 0)
+  //DSTAR
-            {
-              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);
-        }
-      sprintf (state->fsubtype, " VOICE        ");
-      processNXDNVoice (opts, state);
-      //ProcessNXDNFrame (opts, state, 0);
-      return;
-    }
-  else if ((state->synctype == 16) || (state->synctype == 17)) //NXDN Data
-    {
-      //state->rf_mod = 2;
-      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);
-        }
-      sprintf (state->fsubtype, " DATA         ");
-      processNXDNData (opts, state);
-      //ProcessNXDNFrame (opts, state, 0);
-      return;
-    }
   else if ((state->synctype == 6) || (state->synctype == 7))
-    {
+  {
-      state->nac = 0;
+    if ((opts->mbe_out_dir[0] != 0) && (opts->mbe_out_f == NULL))
-      state->lastsrc = 0;
+      openMbeOutFile (opts, state);
-      state->lasttg = 0;
+    sprintf (state->fsubtype, " VOICE        ");
-      if (opts->errorbars == 1)
+    processDSTAR (opts, state);
-        {
+    return;
-          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);
-        }
-      sprintf (state->fsubtype, " VOICE        ");
-      processDSTAR (opts, state);
-      return;
-    }
   else if ((state->synctype == 18) || (state->synctype == 19))
-    {
+  {
-      state->nac = 0;
+    if ((opts->mbe_out_dir[0] != 0) && (opts->mbe_out_f == NULL))
-      state->lastsrc = 0;
+      openMbeOutFile (opts, state);
-      state->lasttg = 0;
+    sprintf (state->fsubtype, " DATA         ");
-      if (opts->errorbars == 1)
+    processDSTAR_HD (opts, state);
-        {
+    return;
-          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);
-        }
-      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
     {
+
+      //print manufacturer strings to branding, disabled 0x10 moto other systems can use that fid set
+      //0x06 is trident, but when searching, apparently, they developed con+, but was bought by moto?
+      if (state->dmr_mfid == 0x10) ; //sprintf (state->dmr_branding, "%s",  "Motorola");
+      else if (state->dmr_mfid == 0x68) sprintf (state->dmr_branding, "%s", "  Hytera");
+      else if (state->dmr_mfid == 0x58) sprintf (state->dmr_branding, "%s", "    Tait");
+      
+      //disabling these due to random data decodes setting an odd mfid, could be legit, but only for that one packet?
+      //or, its just a decode error somewhere
+      // else if (state->dmr_mfid == 0x20) sprintf (state->dmr_branding, "%s", "JVC Kenwood");
+      // else if (state->dmr_mfid == 0x04) sprintf (state->dmr_branding, "%s", "Flyde Micro");
+      // else if (state->dmr_mfid == 0x05) sprintf (state->dmr_branding, "%s", "PROD-EL SPA");
+      // else if (state->dmr_mfid == 0x06) sprintf (state->dmr_branding, "%s", "Motorola"); //trident/moto con+
+      // else if (state->dmr_mfid == 0x07) sprintf (state->dmr_branding, "%s", "RADIODATA");
+      // else if (state->dmr_mfid == 0x08) sprintf (state->dmr_branding, "%s", "Hytera");
+      // else if (state->dmr_mfid == 0x09) sprintf (state->dmr_branding, "%s", "ASELSAN");
+      // else if (state->dmr_mfid == 0x0A) sprintf (state->dmr_branding, "%s", "Kirisun");
+      // else if (state->dmr_mfid == 0x0B) sprintf (state->dmr_branding, "%s", "DMR Association");
+      // else if (state->dmr_mfid == 0x13) sprintf (state->dmr_branding, "%s", "EMC S.P.A.");
+      // else if (state->dmr_mfid == 0x1C) sprintf (state->dmr_branding, "%s", "EMC S.P.A.");
+      // else if (state->dmr_mfid == 0x33) sprintf (state->dmr_branding, "%s", "Radio Activity");
+      // else if (state->dmr_mfid == 0x3C) sprintf (state->dmr_branding, "%s", "Radio Activity");
+      // else if (state->dmr_mfid == 0x77) sprintf (state->dmr_branding, "%s", "Vertex Standard");
+
       //disable so radio id doesn't blink in and out during ncurses and aggressive_framesync
       state->nac = 0;
-      //state->lastsrc = 0;
+
-      //state->lasttg = 0;
-      //state->lastsrcR = 0;
-      //state->lasttgR = 0;
       if (opts->errorbars == 1)
+      {
+        if (opts->verbose > 0)
         {
-          if (opts->verbose > 0)
+          level = (int) state->max / 164;
-            {
+          //fprintf (stderr,"inlvl: %2i%% ", level);
-              level = (int) state->max / 164;
-              //fprintf (stderr,"inlvl: %2i%% ", level);
-            }
         }
+      }
       if ( (state->synctype == 11) || (state->synctype == 12) || (state->synctype == 32) ) //DMR Voice Modes
+      {
+
+        sprintf (state->fsubtype, " VOICE        ");
+        if (opts->dmr_stereo == 0 && state->synctype < 32)
         {
-          if ((opts->mbe_out_dir[0] != 0) && (opts->mbe_out_f == NULL) && opts->dmr_stereo == 0)
+          sprintf (state->slot1light, " slot1 ");
-            {
+          sprintf (state->slot2light, " slot2 ");
-              openMbeOutFile (opts, state);
+          //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); 
-          sprintf (state->fsubtype, " VOICE        ");
+          if (opts->p25_trunk == 0) dmrMSBootstrap (opts, state); 
-          if (opts->dmr_stereo == 0 && state->synctype < 32) // -T option for DMR (TDMA) stereo
-          {
-            sprintf (state->slot1light, " slot1 ");
-            sprintf (state->slot2light, " slot2 ");
-            processDMRvoice (opts, state);
-          }
-          if (opts->dmr_stereo == 0 && state->synctype == 32)
-          {
-            fprintf (stderr, "%s", KRED);
-            fprintf (stderr, "Please use XDMA or DMR Stereo to decode MS/Simplex \n");
-            fprintf (stderr, "%s", KNRM);
-          }
-          if (opts->dmr_stereo == 1) //opts->dmr_stereo == 1
-          {
-            state->dmr_stereo = 1; //set the state to 1 when handling pure voice frames
-            if (state->synctype > 31 )
-            {
-              dmrMSBootstrap (opts, state); //bootstrap into MS Bootstrap (voice only)
-            }
-            else dmrBSBootstrap (opts, state); //bootstrap into BS Bootstrap
-          }
         }
+        if (opts->dmr_mono == 1 && state->synctype == 32)
+        {
+          //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->dmr_stereo == 1) //opts->dmr_stereo == 1
+        {
+          state->dmr_stereo = 1; //set the state to 1 when handling pure voice frames
+          if (state->synctype > 31 )
+          {
+            //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); //bootstrap into MS Bootstrap (voice only)
+          }
+          else dmrBSBootstrap (opts, state); //bootstrap into BS Bootstrap
+        }
+      }
       else if ( (state->synctype == 33) || (state->synctype == 34) ) //MS Data and RC data
       {
-        if (opts->dmr_stereo == 0)
+        if (opts->mbe_out_f != NULL) closeMbeOutFile (opts, state);
-        {
+        if (opts->mbe_out_fR != NULL) closeMbeOutFileR (opts, state);
-          closeMbeOutFile (opts, state);
+        if (opts->p25_trunk == 0) dmrMSData (opts, state);
-          state->err_str[0] = 0;
-          fprintf (stderr, "%s", KRED);
-          fprintf (stderr, "Please use XDMA or DMR Stereo to decode MS/Simplex \n");
-          fprintf (stderr, "%s", KNRM);
-        }
-        if (opts->dmr_stereo == 1)
-        {
-          dmrMSData (opts, state);
-
-        }
       }
       else
       {
         if (opts->dmr_stereo == 0)
         {
-          closeMbeOutFile (opts, state);
+          if (opts->mbe_out_f != NULL) closeMbeOutFile (opts, state);
+          if (opts->mbe_out_fR != NULL) closeMbeOutFileR (opts, state);
+
           state->err_str[0] = 0;
           sprintf (state->slot1light, " slot1 ");
           sprintf (state->slot2light, " slot2 ");
-          state->payload_miP = 0; //zero out when switching back to data sync
+          dmr_data_sync (opts, state);
-          processDMRdata (opts, state);
         }
         //switch dmr_stereo to 0 when handling BS data frame syncs with processDMRdata
         if (opts->dmr_stereo == 1)
         {
+          if (opts->mbe_out_f != NULL) closeMbeOutFile (opts, state);
+          if (opts->mbe_out_fR != NULL) closeMbeOutFileR (opts, state);
+
           state->dmr_stereo = 0; //set the state to zero for handling pure data frames
           sprintf (state->slot1light, " slot1 ");
           sprintf (state->slot2light, " slot2 ");
-          state->payload_miP = 0; //zero out when switching back to data sync
+          dmr_data_sync (opts, state);
-          processDMRdata (opts, state);
         }
       }
       return;
     }
-  else if ((state->synctype >= 2) && (state->synctype <= 5))
+    //X2-TDMA
+    else if ((state->synctype >= 2) && (state->synctype <= 5))
     {
       state->nac = 0;
       if (opts->errorbars == 1)
@@ -271,15 +223,15 @@ processFrame (dsd_opts * opts, dsd_state * state)
       if ((state->synctype == 3) || (state->synctype == 4))
         {
           if ((opts->mbe_out_dir[0] != 0) && (opts->mbe_out_f == NULL))
-            {
+          {
-              openMbeOutFile (opts, state);
+            openMbeOutFile (opts, state);
-            }
+          }
           sprintf (state->fsubtype, " VOICE        ");
           processX2TDMAvoice (opts, state);
         }
       else
         {
-          closeMbeOutFile (opts, state);
+          if (opts->mbe_out_f != NULL) closeMbeOutFile (opts, state);
           state->err_str[0] = 0;
           processX2TDMAdata (opts, state);
         }
@@ -287,48 +239,51 @@ processFrame (dsd_opts * opts, dsd_state * state)
     }
   else if ((state->synctype == 14) || (state->synctype == 15))
     {
-      state->nac = 0;
-      state->lastsrc = 0;
-      state->lasttg = 0;
       if (opts->errorbars == 1)
+      {
+        if (opts->verbose > 0)
         {
-          if (opts->verbose > 0)
+          level = (int) state->max / 164;
-            {
+          //fprintf (stderr,"inlvl: %2i%% ", level);
-              level = (int) state->max / 164;
-              //fprintf (stderr,"inlvl: %2i%% ", level);
-            }
         }
+      }
       if ((opts->mbe_out_dir[0] != 0) && (opts->mbe_out_f == NULL))
-        {
+      {
-          openMbeOutFile (opts, state);
+        openMbeOutFile (opts, state);
-        }
+      }
       sprintf (state->fsubtype, " VOICE        ");
       processProVoice (opts, state);
       return;
     }
+    //edacs
+    else if ((state->synctype == 37) || (state->synctype == 38))
+    {
+      if (opts->mbe_out_f != NULL) closeMbeOutFile (opts, state); 
+      edacs (opts, state);
+      return;
+    }
     //ysf
     else if ((state->synctype == 30) || (state->synctype == 31))
     {
-      //Do stuff
+      //relocate MBEout to inside frame handling -- Not Working Currently for YSF
-      //fprintf(stderr, "YSF Sync! \n");
-      if ((opts->mbe_out_dir[0] != 0) && (opts->mbe_out_f == NULL))
-      {
-        //openMbeOutFile (opts, state);
-      }
-      //sprintf(state->fsubtype, " VOICE        ");
       processYSF(opts, state);
       return;
     }
+    //M17
+    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 
+        processM17LSF(opts, state);
+      return;
+    }
     //P25 P2
     else if ((state->synctype == 35) || (state->synctype == 36))
     {
-      //Do stuff
+      //relocate MBEout to inside frame handling
-      //fprintf(stderr, "YSF Sync! \n");
-      if ((opts->mbe_out_dir[0] != 0) && (opts->mbe_out_f == NULL))
-      {
-        //openMbeOutFile (opts, state);
-      }
-      //sprintf(state->fsubtype, " VOICE        ");
       processP2(opts, state);
       return;
     }
@@ -337,6 +292,7 @@ processFrame (dsd_opts * opts, dsd_state * state)
     {
       /* dPMR Frame Sync 1 */
       fprintf(stderr, "dPMR Frame Sync 1 ");
+      if (opts->mbe_out_f != NULL) closeMbeOutFile (opts, state);
     }
     else if ((state->synctype == 21) || (state->synctype == 25))
     {
@@ -355,12 +311,12 @@ processFrame (dsd_opts * opts, dsd_state * state)
         }
         state->nac = 0;
 
-          if ((opts->mbe_out_dir[0] != 0) && (opts->mbe_out_f == NULL))
+        if ((opts->mbe_out_dir[0] != 0) && (opts->mbe_out_f == NULL))
-          {
+        {
-            openMbeOutFile (opts, state);
+          openMbeOutFile (opts, state);
-          }
+        }
-          sprintf(state->fsubtype, " VOICE        ");
+        sprintf(state->fsubtype, " VOICE        ");
-          processdPMRvoice (opts, state);
+        processdPMRvoice (opts, state);
 
         return;
 
@@ -369,11 +325,13 @@ processFrame (dsd_opts * opts, dsd_state * state)
     {
       /* dPMR Frame Sync 3 */
       fprintf(stderr, "dPMR Frame Sync 3 ");
+      if (opts->mbe_out_f != NULL) closeMbeOutFile (opts, state);
     }
     else if ((state->synctype == 23) || (state->synctype == 27))
     {
       /* dPMR Frame Sync 4 */
       fprintf(stderr, "dPMR Frame Sync 4 ");
+      if (opts->mbe_out_f != NULL) closeMbeOutFile (opts, state);
     }
     //dPMR
   else //P25
@@ -446,7 +404,8 @@ processFrame (dsd_opts * opts, dsd_state * state)
           if (new_nac != state->nac) {
               // NAC fixed by error correction
               state->nac = new_nac;
-              if (state->p2_hardset == 0 && new_nac != 0)
+              //apparently, both 0 and 0xFFF can the BCH code on signal drop
+              if (state->p2_hardset == 0 && new_nac != 0 && new_nac != 0xFFF)
               {
                 state->p2_cc = new_nac;
               }
@@ -472,15 +431,15 @@ processFrame (dsd_opts * opts, dsd_state * state)
     {
       // Header Data Unit
       if (opts->errorbars == 1)
-        {
+      {
-          printFrameInfo (opts, state);
+        printFrameInfo (opts, state);
-          fprintf (stderr," HDU\n");
+        fprintf (stderr," HDU\n");
-        }
+      }
       if (opts->mbe_out_dir[0] != 0)
-        {
+      {
-          closeMbeOutFile (opts, state);
+        if (opts->mbe_out_f != NULL) closeMbeOutFile (opts, state); 
-          openMbeOutFile (opts, state);
+        if (opts->mbe_out_f == NULL) openMbeOutFile (opts, state);
-        }
+      }
       mbe_initMbeParms (state->cur_mp, state->prev_mp, state->prev_mp_enhanced);
       state->lastp25type = 2;
       state->dmrburstL = 25;
@@ -492,26 +451,22 @@ processFrame (dsd_opts * opts, dsd_state * state)
     {
       // Logical Link Data Unit 1
       if (opts->errorbars == 1)
-        {
+      {
-          printFrameInfo (opts, state);
+        printFrameInfo (opts, state);
-          fprintf (stderr," LDU1  ");
+        fprintf (stderr," LDU1  ");
-        }
+      }
       if (opts->mbe_out_dir[0] != 0)
+      {
+        if (opts->mbe_out_f == NULL)
         {
-          if (opts->mbe_out_f == NULL)
+          openMbeOutFile (opts, state);
-            {
-              openMbeOutFile (opts, state);
-            }
         }
+      }
       state->lastp25type = 1;
       state->dmrburstL = 26;
       state->currentslot = 0;
       sprintf (state->fsubtype, " LDU1         ");
       state->numtdulc = 0;
-      if (state->payload_algid == 0x81)
-      {
-        fprintf (stderr, "\n");
-      }
 
       processLDU1 (opts, state);
     }
@@ -523,27 +478,27 @@ processFrame (dsd_opts * opts, dsd_state * state)
       if (state->lastp25type != 1)
         {
           if (opts->errorbars == 1)
-            {
+          {
-              printFrameInfo (opts, state);
+            printFrameInfo (opts, state);
-              fprintf (stderr,"\n Ignoring LDU2 not preceeded by LDU1\n");
+            fprintf (stderr,"\n Ignoring LDU2 not preceeded by LDU1\n");
-            }
+          }
           state->lastp25type = 0;
           sprintf (state->fsubtype, "              ");
         }
       else
         {
           if (opts->errorbars == 1)
-            {
+          {
-              printFrameInfo (opts, state);
+            printFrameInfo (opts, state);
-              fprintf (stderr," LDU2  ");
+            fprintf (stderr," LDU2  ");
-            }
+          }
           if (opts->mbe_out_dir[0] != 0)
+          {
+            if (opts->mbe_out_f == NULL)
             {
-              if (opts->mbe_out_f == NULL)
+              openMbeOutFile (opts, state);
-                {
-                  openMbeOutFile (opts, state);
-                }
             }
+          }
           state->lastp25type = 2;
           sprintf (state->fsubtype, " LDU2         ");
           state->numtdulc = 0;
@@ -555,25 +510,25 @@ processFrame (dsd_opts * opts, dsd_state * state)
       // Terminator with subsequent Link Control
       state->dmrburstL = 28;
       if (opts->errorbars == 1)
-        {
+      {
-          printFrameInfo (opts, state);
+        printFrameInfo (opts, state);
-          fprintf (stderr," TDULC\n");
+        fprintf (stderr," TDULC\n");
-        }
+      }
       if (opts->mbe_out_dir[0] != 0)
-        {
+      {
-          closeMbeOutFile (opts, state);
+        if (opts->mbe_out_f != NULL) closeMbeOutFile (opts, state);
-        }
+      }
       mbe_initMbeParms (state->cur_mp, state->prev_mp, state->prev_mp_enhanced);
-      state->lasttg = 0;
+      // state->lasttg = 0;
-      state->lastsrc = 0;
+      // state->lastsrc = 0;
       state->lastp25type = 0;
       state->err_str[0] = 0;
       sprintf (state->fsubtype, " TDULC        ");
       state->numtdulc++;
       if ((opts->resume > 0) && (state->numtdulc > opts->resume))
-        {
+      {
-          resumeScan (opts, state);
+        resumeScan (opts, state);
-        }
+      }
       processTDULC (opts, state);
       state->err_str[0] = 0;
     }
@@ -582,14 +537,14 @@ processFrame (dsd_opts * opts, dsd_state * state)
       // Terminator without subsequent Link Control
       state->dmrburstL = 28;
       if (opts->errorbars == 1)
-        {
+      {
-          printFrameInfo (opts, state);
+        printFrameInfo (opts, state);
-          fprintf (stderr," TDU\n");
+        fprintf (stderr," TDU\n");
-        }
+      }
       if (opts->mbe_out_dir[0] != 0)
-        {
+      {
-          closeMbeOutFile (opts, state);
+        if (opts->mbe_out_f != NULL) closeMbeOutFile (opts, state);
-        }
+      }
       mbe_initMbeParms (state->cur_mp, state->prev_mp, state->prev_mp_enhanced);
       state->lasttg = 0;
       state->lastsrc = 0;
@@ -603,120 +558,59 @@ processFrame (dsd_opts * opts, dsd_state * state)
     {
       state->dmrburstL = 29;
       if (opts->errorbars == 1)
-        {
+      {
-          printFrameInfo (opts, state);
+        printFrameInfo (opts, state);
-          fprintf (stderr," TSBK");
+        fprintf (stderr," TSBK");
-        }
+      }
+      if (opts->mbe_out_dir[0] != 0)
+      {
+        if (opts->mbe_out_f != NULL) closeMbeOutFile (opts, state);
+        if (opts->mbe_out_fR != NULL) closeMbeOutFileR (opts, state);
+      }
       if (opts->resume > 0)
-        {
+      {
-          resumeScan (opts, state);
+        resumeScan (opts, state);
-        }
+      }
       state->lasttg = 0;
       state->lastsrc = 0;
       state->lastp25type = 3;
       sprintf (state->fsubtype, " TSBK         ");
 
-      // Now processing NID
       processTSBK(opts, state);
 
     }
   else if (strcmp (duid, "30") == 0)
     {
+      state->dmrburstL = 29;
       if (opts->errorbars == 1)
-        {
+      {
-          printFrameInfo (opts, state);
+        printFrameInfo (opts, state);
-          fprintf (stderr," PDU\n");
+        fprintf (stderr," MPDU\n"); //multi block format PDU
-        }
+      }
+      if (opts->mbe_out_dir[0] != 0)
+      {
+        if (opts->mbe_out_f != NULL) closeMbeOutFile (opts, state);
+        if (opts->mbe_out_fR != NULL) closeMbeOutFileR (opts, state);
+      }
       if (opts->resume > 0)
-        {
+      {
-          resumeScan (opts, state);
+        resumeScan (opts, state);
-        }
+      }
-      if (opts->mbe_out_dir[0] != 0)
-        {
-          if (opts->mbe_out_f == NULL)
-            {
-              openMbeOutFile (opts, state);
-            }
-        }
       state->lastp25type = 4;
-      sprintf (state->fsubtype, " PDU          ");
+      sprintf (state->fsubtype, " MPDU         ");
-    }
-  // try to guess based on previous frame if unknown type
-  else if (state->lastp25type == 1)
-    {
-      if (opts->errorbars == 1)
-        {
-          printFrameInfo (opts, state);
-          fprintf (stderr,"(LDU2) ");
-        }
-      if (opts->mbe_out_dir[0] != 0)
-        {
-          if (opts->mbe_out_f == NULL)
-            {
-              openMbeOutFile (opts, state);
-            }
-        }
-      //state->lastp25type = 0;
-      // Guess that the state is LDU2
-      state->lastp25type = 2;
-      sprintf (state->fsubtype, "(LDU2)        ");
-      state->numtdulc = 0;
-      processLDU2 (opts, state);
-    }
-  else if (state->lastp25type == 2)
-    {
-      if (opts->errorbars == 1)
-        {
-          printFrameInfo (opts, state);
-          fprintf (stderr,"(LDU1) ");
-        }
-      if (opts->mbe_out_dir[0] != 0)
-        {
-          if (opts->mbe_out_f == NULL)
-            {
-              openMbeOutFile (opts, state);
-            }
-        }
-      //state->lastp25type = 0;
-      // Guess that the state is LDU1
-      state->lastp25type = 1;
-      sprintf (state->fsubtype, "(LDU1)        ");
-      state->numtdulc = 0;
-      processLDU1 (opts, state);
-    }
-  else if (state->lastp25type == 3)
-    {
-      if (opts->errorbars == 1)
-        {
-          printFrameInfo (opts, state);
-          fprintf (stderr," (TSBK)\n");
-        }
-      //state->lastp25type = 0;
-      // Guess that the state is TSBK
-      state->lastp25type = 3;
-      sprintf (state->fsubtype, "(TSBK)        ");
 
-      // Now processing NID
+      processMPDU(opts, state);
-      skipDibit (opts, state, 328-25);
-    }
-  else if (state->lastp25type == 4)
-    {
-      if (opts->errorbars == 1)
-        {
-          printFrameInfo (opts, state);
-          fprintf (stderr," (PDU)\n");
-        }
-      state->lastp25type = 0;
     }
+
   else
+  {
+    state->lastp25type = 0;
+    sprintf (state->fsubtype, "              ");
+    if (opts->errorbars == 1)
     {
-      state->lastp25type = 0;
+      printFrameInfo (opts, state);
-      sprintf (state->fsubtype, "              ");
+      // fprintf (stderr," duid:%s *Unknown DUID*\n", duid);
-      if (opts->errorbars == 1)
+      fprintf (stderr," duid:%s \n", duid); //DUID ERR
-        {
-          printFrameInfo (opts, state);
-          fprintf (stderr," duid:%s *Unknown DUID*\n", duid); //prints on dPMR frame 3
-          // fprintf (stderr, "\n"); //prints on dPMR frame 3
-        }
     }
+  }
 }

src/dsd_gps.c

@@ -0,0 +1,688 @@
+/*-------------------------------------------------------------------------------
+ * 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)
+    {
+      //open file by name that is supplied in the ncurses terminal, or cli
+      pFile = fopen (opts->lrrp_out_file, "a");
+      fprintf (pFile, "%s\t", getDateL() );
+      fprintf (pFile, "%s\t", getTimeL() );
+      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);
+
+    }
+
+  }
+  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)
+  {
+    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", getDateL() );
+    fprintf (pFile, "%s\t", getTimeL() ); //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);
+
+  }
+
+}
+
+//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)
+  {
+    //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", getDateL() );
+    fprintf (pFile, "%s\t", getTimeL() ); //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);
+
+  }
+
+  //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)
+  {
+    //open file by name that is supplied in the ncurses terminal, or cli
+    pFile = fopen (opts->lrrp_out_file, "a");
+    fprintf (pFile, "%s\t", getDateL() );
+    fprintf (pFile, "%s\t", getTimeL() );
+    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);
+
+  }
+
+  //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)
+      {
+        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", getDateL() );
+        fprintf (pFile, "%s\t", getTimeL() );
+        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;
+
+        //open file by name that is supplied in the ncurses terminal, or cli
+        pFile = fopen (opts->lrrp_out_file, "a");
+        fprintf (pFile, "%s\t", getDateL() );
+        fprintf (pFile, "%s\t", getTimeL() );
+        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);
+}

src/dsd_import.c

@@ -0,0 +1,259 @@
+
+
+#include "dsd.h"
+#define BSIZE 999
+
+int csvGroupImport(dsd_opts * opts, dsd_state * state)
+{
+  char filename[1024] = "filename.csv"; 
+  sprintf (filename, "%s", opts->group_in_file); 
+  //filename[1023] = '\0'; //necessary?
+  char buffer[BSIZE];
+  FILE * fp;
+  fp = fopen(filename, "r");
+  if (fp == NULL) {
+    printf("Unable to open group file '%s'\n", filename);
+    exit(1);
+  }
+  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;
+    row_count++;
+    if (row_count == 1)
+      continue; //don't want labels
+    char * field = strtok(buffer, ","); //seperate by comma
+    while (field) {
+      
+      if (field_count == 0)
+      {
+        //group_number = atol(field);
+        state->group_array[i].groupNumber = atol(field);
+        fprintf (stderr, "%ld, ", state->group_array[i].groupNumber);
+      }
+      if (field_count == 1)
+      {
+        strcpy(state->group_array[i].groupMode, field);
+        fprintf (stderr, "%s, ", state->group_array[i].groupMode);
+      }
+      if (field_count == 2)
+      {
+        strcpy(state->group_array[i].groupName, field);
+        fprintf (stderr, "%s ", state->group_array[i].groupName);
+      }
+ 
+      field = strtok(NULL, ",");
+      field_count++;
+    }
+    fprintf (stderr, "\n");
+    i++;
+    state->group_tally++; 
+  }
+  fclose(fp);
+  return 0;
+}
+
+//LCN import for EDACS, migrated to channel map (channel map does both)
+int csvLCNImport(dsd_opts * opts, dsd_state * state) 
+{
+  char filename[1024] = "filename.csv"; 
+  sprintf (filename, "%s", opts->lcn_in_file); 
+  //filename[1023] = '\0'; //necessary?
+  char buffer[BSIZE];
+  FILE * fp;
+  fp = fopen(filename, "r");
+  if (fp == NULL) {
+    printf("Unable to open lcn file '%s'\n", filename);
+    //have this return -1 and handle it inside of main
+    exit(1);
+  }
+  int row_count = 0;
+  int field_count = 0;
+
+  while (fgets(buffer, BSIZE, fp)) {
+    field_count = 0;
+    row_count++;
+    if (row_count == 1)
+      continue; //don't want labels
+    char * field = strtok(buffer, ","); //seperate by comma
+    while (field) {
+
+      state->trunk_lcn_freq[field_count] = atol (field);
+      state->lcn_freq_count++; //keep tally of number of Frequencies imported
+      fprintf (stderr, "LCN [%d] [%ld]", field_count+1, state->trunk_lcn_freq[field_count]);
+      fprintf (stderr, "\n");
+
+      
+      field = strtok(NULL, ",");
+      field_count++;
+    }
+    fprintf (stderr, "LCN Count %d\n", state->lcn_freq_count);
+    
+  }
+  fclose(fp);
+  return 0;
+}
+
+int csvChanImport(dsd_opts * opts, dsd_state * state) //channel map import
+{
+  char filename[1024] = "filename.csv"; 
+  sprintf (filename, "%s", opts->chan_in_file);
+
+  char buffer[BSIZE];
+  FILE * fp;
+  fp = fopen(filename, "r");
+  if (fp == NULL) {
+    printf("Unable to open channel map file '%s'\n", filename);
+    //have this return -1 and handle it inside of main
+    exit(1);
+  }
+  int row_count = 0;
+  int field_count = 0;
+
+  long int chan_number;
+
+  while (fgets(buffer, BSIZE, fp)) {
+    field_count = 0;
+    row_count++;
+    if (row_count == 1)
+      continue; //don't want labels
+    char * field = strtok(buffer, ","); //seperate by comma
+    while (field) {
+
+      if (field_count == 0)
+      {
+        sscanf (field, "%ld", &chan_number);
+      }
+
+      if (field_count == 1)
+      {
+        sscanf (field, "%ld", &state->trunk_chan_map[chan_number]);
+        //adding this should be compatible with EDACS, test and obsolete the LCN Import function if desired
+        sscanf (field, "%ld", &state->trunk_lcn_freq[state->lcn_freq_count]);
+        state->lcn_freq_count++; //keep tally of number of Frequencies imported
+      }
+      
+      field = strtok(NULL, ",");
+      field_count++;
+    }
+    fprintf (stderr, "Channel [%05ld] [%09ld]", chan_number, state->trunk_chan_map[chan_number]);
+    fprintf (stderr, "\n");
+    
+  }
+  fclose(fp);
+  return 0;
+}
+
+//Decimal Variant of Key Import
+int csvKeyImportDec(dsd_opts * opts, dsd_state * state) //multi-key support
+{
+  char filename[1024] = "filename.csv"; 
+  sprintf (filename, "%s", opts->key_in_file);
+
+  char buffer[BSIZE];
+  FILE * fp;
+  fp = fopen(filename, "r");
+  if (fp == NULL) {
+    printf("Unable to open file '%s'\n", filename);
+    exit(1);
+  }
+  int row_count = 0;
+  int field_count = 0;
+  
+  unsigned long long int keynumber = 0;
+  unsigned long long int keyvalue = 0;
+
+  uint16_t hash = 0;
+  uint8_t hash_bits[24];
+  memset (hash_bits, 0, sizeof(hash_bits));
+
+  while (fgets(buffer, BSIZE, fp)) {
+    field_count = 0;
+    row_count++;
+    if (row_count == 1)
+      continue; //don't want labels
+    char * field = strtok(buffer, ","); //seperate by comma
+    while (field) {
+
+      if (field_count == 0)
+      {
+        sscanf (field, "%lld", &keynumber);
+        if (keynumber > 0xFFFF) //if larger than 16-bits, get its hash instead
+        {
+          keynumber = keynumber & 0xFFFFFF; //truncate to 24-bits (max allowed)
+          for (int i = 0; i < 24; i++)
+          {
+            hash_bits[i] = ((keynumber << i) & 0x800000) >> 23; //load into array for CRC16 
+          }
+          hash = ComputeCrcCCITT16d (hash_bits, 24);
+          keynumber = hash & 0xFFFF; //make sure its no larger than 16-bits
+          fprintf (stderr, "Hashed ");
+        }
+        
+      }
+
+      if (field_count == 1)
+      {
+        sscanf (field, "%lld", &keyvalue);
+        state->rkey_array[keynumber] = keyvalue & 0xFFFFFFFFFF; //doesn't exceed 40-bit value
+      }
+      
+      field = strtok(NULL, ",");
+      field_count++;
+    }
+    fprintf (stderr, "Key [%03lld] [%05lld]", keynumber, state->rkey_array[keynumber]);
+    fprintf (stderr, "\n");
+    hash = 0;
+    
+  }
+  fclose(fp);
+  return 0;
+}
+
+//Hex Variant of Key Import
+int csvKeyImportHex(dsd_opts * opts, dsd_state * state) //key import for rc4 keys
+{
+  char filename[1024] = "filename.csv";
+  sprintf (filename, "%s", opts->key_in_file);
+  char buffer[BSIZE];
+  FILE * fp;
+  fp = fopen(filename, "r");
+  if (fp == NULL) {
+    printf("Unable to open file '%s'\n", filename);
+    exit(1);
+  }
+  int row_count = 0;
+  int field_count = 0;
+  unsigned long long int keynumber;
+
+  while (fgets(buffer, BSIZE, fp)) {
+    field_count = 0;
+    row_count++;
+    if (row_count == 1)
+      continue; //don't want labels
+    char * field = strtok(buffer, ","); //seperate by comma
+    while (field) {
+
+      if (field_count == 0)
+      {
+        sscanf (field, "%llX", &keynumber);
+      }
+
+      if (field_count == 1)
+      {
+        sscanf (field, "%llX", &state->rkey_array[keynumber]);
+      }
+      
+      field = strtok(NULL, ",");
+      field_count++;
+    }
+    fprintf (stderr, "Key [%04llX] [%016llX]", keynumber, state->rkey_array[keynumber]);
+    fprintf (stderr, "\n");
+    
+  }
+  fclose(fp);
+  return 0;
+}

src/dsd_ks.c

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

src/dsd_mbe2.c

@@ -0,0 +1,174 @@
+/*-------------------------------------------------------------------------------
+ * 
+ * 
+ *
+ * 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);
+  mbe_demodulateImbe7200x4400Data (imbe_fr7200);
+  state->errs2 = mbe_eccImbe7200x4400Data (imbe_fr7200, imbe_d);
+  state->debug_audio_errors += state->errs2 + state->errs;
+
+}
+
+//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);
+  mbe_demodulateImbe7100x4400Data (imbe_fr7100);
+  state->errs2 = mbe_eccImbe7100x4400Data (imbe_fr7100, imbe_d);
+  state->debug_audio_errors += state->errs2 + state->errs;
+
+}
+
+//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);
+  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)
+      playSynthesizedVoice(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)
+      playSynthesizedVoice(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

@@ -2,26 +2,59 @@
 #include "dsd.h"
 #include "p25p1_heuristics.h"
 
-void
+//fixed the memory leak, but now random segfaults occur -- double free or corruption (out) or (!prev)
-resetState (dsd_state * state)
+void resetState (dsd_state * state)
 {
 
-  int i, j;
+  int i;
 
+  //Dibit Buffer -- Free Allocated Memory
+  // free (state->dibit_buf);
+
+  //Dibit Buffer -- Memset/Init/Allocate Memory
   // state->dibit_buf = malloc (sizeof (int) * 1000000);
-  // state->dibit_buf_p = state->dibit_buf + 200;
+  
-  // memset (state->dibit_buf, 0, sizeof (int) * 200);
+  state->dibit_buf_p = state->dibit_buf + 200;
-  state->repeat = 0; //not sure yet
+  memset (state->dibit_buf, 0, sizeof (int) * 200);
-  //state->audio_out_buf = malloc (sizeof (short) * 1000000);
+  state->repeat = 0; //repeat frame?
-  //memset (state->audio_out_buf, 0, 100 * sizeof (short));
+
-  //state->audio_out_buf_p = state->audio_out_buf + 100;
+  //Audio Buffer -- Free Allocated Memory
-  //state->audio_out_float_buf = malloc (sizeof (float) * 1000000);
+  free (state->audio_out_buf);
-  //memset (state->audio_out_float_buf, 0, 100 * sizeof (float));
+  free (state->audio_out_float_buf);
-  //state->audio_out_float_buf_p = state->audio_out_float_buf + 100;
+  free (state->audio_out_bufR);
-  //state->audio_out_idx = 0;
+  free (state->audio_out_float_bufR);
-  //state->audio_out_idx2 = 0;
+
-  //state->audio_out_temp_buf_p = state->audio_out_temp_buf;
+  //Audio Buffer -- Memset/Init/Allocate Memory per slot
-  //state->wav_out_bytes = 0;
+
+  //slot 1
+  state->audio_out_float_buf = malloc (sizeof (float) * 1000000);
+  state->audio_out_buf = malloc (sizeof (short) * 1000000);
+
+  memset (state->audio_out_buf, 0, 100 * sizeof (short));
+  state->audio_out_buf_p = state->audio_out_buf + 100;
+  
+  memset (state->audio_out_float_buf, 0, 100 * sizeof (float));
+  state->audio_out_float_buf_p = state->audio_out_float_buf + 100;
+
+  state->audio_out_idx = 0;
+  state->audio_out_idx2 = 0;
+  state->audio_out_temp_buf_p = state->audio_out_temp_buf;
+
+  //slot 2
+  state->audio_out_bufR = malloc (sizeof (short) * 1000000);
+  state->audio_out_float_bufR = malloc (sizeof (float) * 1000000);
+
+  memset (state->audio_out_bufR, 0, 100 * sizeof (short));
+  state->audio_out_buf_pR = state->audio_out_bufR + 100;
+  
+  memset (state->audio_out_float_bufR, 0, 100 * sizeof (float));
+  state->audio_out_float_buf_pR = state->audio_out_float_bufR + 100;
+
+  state->audio_out_idxR = 0;
+  state->audio_out_idx2R = 0;
+  state->audio_out_temp_buf_pR = state->audio_out_temp_bufR;
+
+  //Sync
   state->center = 0;
   state->jitter = -1;
   state->synctype = -1;
@@ -31,76 +64,73 @@ resetState (dsd_state * state)
   state->umid = 0;
   state->minref = -12000;
   state->maxref = 12000;
+
   state->lastsample = 0;
   for (i = 0; i < 128; i++)
-    {
+  {
-      state->sbuf[i] = 0;
+    state->sbuf[i] = 0;
-    }
+  }
   state->sidx = 0;
   for (i = 0; i < 1024; i++)
-    {
+  {
-      state->maxbuf[i] = 15000;
+    state->maxbuf[i] = 15000;
-    }
+  }
   for (i = 0; i < 1024; i++)
-    {
+  {
-      state->minbuf[i] = -15000;
+    state->minbuf[i] = -15000;
-    }
+  }
+
   state->midx = 0;
-  state->err_str[0] = 0;
-  sprintf (state->fsubtype, "              ");
-  sprintf (state->ftype, "             ");
   state->symbolcnt = 0;
-  state->rf_mod = 0;
+
   state->numflips = 0;
   state->lastsynctype = -1;
   state->lastp25type = 0;
   state->offset = 0;
   state->carrier = 0;
-  for (i = 0; i < 25; i++)
+
-    {
+  //Reset Voice Errors in C0 and C1 (or remaining Codewords in IMBE)
-      for (j = 0; j < 16; j++)
-        {
-          state->tg[i][j] = 48;
-        }
-    }
-  state->tgcount = 0;
-  state->lasttg = 0;
-  state->lastsrc = 0;
-  state->nac = 0;
   state->errs = 0;
   state->errs2 = 0;
-  state->mbe_file_type = -1;
+  state->errsR = 0;
+  state->errs2R = 0;
+
+  //Misc -- may not be needed
   state->optind = 0;
   state->numtdulc = 0;
   state->firstframe = 0;
-  sprintf (state->slot0light, " slot0 ");
-  sprintf (state->slot1light, " slot1 ");
-  state->aout_gain = 25;
-  memset (state->aout_max_buf, 0, sizeof (float) * 200);
-  state->aout_max_buf_p = state->aout_max_buf;
-  state->aout_max_buf_idx = 0;
-  state->samplesPerSymbol = 10;
-  state->symbolCenter = 4;
-  sprintf (state->algid, "________");
-  sprintf (state->keyid, "________________");
-  state->currentslot = 0;
-  state->cur_mp = malloc (sizeof (mbe_parms));
-  state->prev_mp = malloc (sizeof (mbe_parms));
-  state->prev_mp_enhanced = malloc (sizeof (mbe_parms));
-  mbe_initMbeParms (state->cur_mp, state->prev_mp, state->prev_mp_enhanced);
-  state->p25kid = 0;
 
-  state->debug_audio_errors = 0;
+  //unsure if these are still used or ever were used, 
-  state->debug_header_errors = 0;
+  // memset (state->aout_max_buf, 0, sizeof (float) * 200);
-  state->debug_header_critical_errors = 0;
+  // state->aout_max_buf_p = state->aout_max_buf;
+  // state->aout_max_buf_idx = 0;
 
-  state->nxdn_last_ran = 0;
+  // //MBE Specific 
-  // state->payload_algid = 0;
+  // //free the memory before allocating it again -- may not use this
-  // state->payload_algidR = 0;
+  // free (state->cur_mp);
-  state->dmr_encL = 0;
+  // free (state->prev_mp);
-  state->dmr_encR = 0;
+  // free (state->prev_mp_enhanced);
 
-  //each time you run this, it increses memory use by 4MB, massive memory leak
+  // //memory allocation and init on mbe -- may not use this
-  //need to revisit this sometime and look into only resetting only the necesary items to let P25 switch between signals (C4FM or Wide) without needing a restart
+  // state->cur_mp = malloc (sizeof (mbe_parms));
-  initialize_p25_heuristics(&state->p25_heuristics); //see if we want to re-init this or not, currently seems to cause memory leak when running over and over, mitigated with a reset flag
+  // state->prev_mp = malloc (sizeof (mbe_parms));
+  // state->prev_mp_enhanced = malloc (sizeof (mbe_parms));
+  // mbe_initMbeParms (state->cur_mp, state->prev_mp, state->prev_mp_enhanced);
+
+  //rest the heurestics, we want to do this on each tune, each RF frequency can deviate quite a bit in strength
+  initialize_p25_heuristics(&state->p25_heuristics);
+  initialize_p25_heuristics(&state->inv_p25_heuristics);
+}
+
+//simple function to reset the dibit buffer
+void reset_dibit_buffer(dsd_state * state)
+{
+	//Dibit Buffer -- Free Allocated Memory
+  // free (state->dibit_buf);
+
+  //Dibit Buffer -- Memset/Init/Allocate Memory
+  // state->dibit_buf = malloc (sizeof (int) * 1000000);
+
+  state->dibit_buf_p = state->dibit_buf + 200;
+  memset (state->dibit_buf, 0, sizeof (int) * 200);
 }

src/dsd_rigctl.c

@@ -0,0 +1,348 @@
+/*-------------------------------------------------------------------------------
+ * dsd_rigctl.c
+ * Simple RIGCTL Client for DSD (remote control of GQRX, SDR++, etc)
+ *
+ * Portions from https://github.com/neural75/gqrx-scanner
+ *
+ * LWVMOBILE
+ * 2022-10 DSD-FME Florida Man Edition
+ *-----------------------------------------------------------------------------*/
+
+#include "dsd.h"
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netdb.h>
+
+//UDP Specific
+#include <arpa/inet.h>
+
+#define BUFSIZE         1024
+#define FREQ_MAX        4096
+#define SAVED_FREQ_MAX  1000
+#define TAG_MAX         100
+
+//
+// error - wrapper for perror
+//
+void error(char *msg) {
+    perror(msg);
+    exit(0);
+}
+
+struct sockaddr_in address;
+
+//
+// Connect
+//
+int Connect (char *hostname, int portno)
+{
+    int sockfd;
+    struct sockaddr_in serveraddr;
+    struct hostent *server;
+
+
+    /* socket: create the socket */
+    sockfd = socket(AF_INET, SOCK_STREAM, 0);
+    if (sockfd < 0)
+    {
+      fprintf(stderr,"ERROR opening socket\n");
+      error("ERROR opening socket");
+    }
+        
+
+    /* gethostbyname: get the server's DNS entry */
+    server = gethostbyname(hostname);
+    if (server == NULL) {
+        fprintf(stderr,"ERROR, no such host as %s\n", hostname);
+        //exit(0);
+        return (0); //return 0, check on other end and configure pulse input 
+    }
+
+    /* build the server's Internet address */
+    bzero((char *) &serveraddr, sizeof(serveraddr));
+    serveraddr.sin_family = AF_INET;
+    bcopy((char *)server->h_addr,
+	  (char *)&serveraddr.sin_addr.s_addr, server->h_length);
+    serveraddr.sin_port = htons(portno);
+
+    /* connect: create a connection with the server */
+    if (connect(sockfd, (const struct sockaddr *) &serveraddr, sizeof(serveraddr)) < 0)
+    {
+        fprintf(stderr,"ERROR opening socket\n");
+        return (0);
+    }      
+
+    return sockfd;
+}
+//
+// Send
+//
+bool Send(int sockfd, char *buf)
+{
+    int n;
+
+    n = write(sockfd, buf, strlen(buf));
+    if (n < 0)
+      error("ERROR writing to socket");
+    return true;
+}
+
+//
+// Recv
+//
+bool Recv(int sockfd, char *buf)
+{
+    int n;
+
+    n = read(sockfd, buf, BUFSIZE);
+    if (n < 0)
+      error("ERROR reading from socket");
+    buf[n]= '\0';
+    return true;
+}
+
+
+//
+// GQRX Protocol
+//
+long int GetCurrentFreq(int sockfd) 
+{
+    long int freq = 0;
+    char buf[BUFSIZE];
+    char * ptr;
+    char * token;
+
+    Send(sockfd, "f\n");
+    Recv(sockfd, buf); 
+
+    if (strcmp(buf, "RPRT 1") == 0 ) 
+        return freq;
+
+    token = strtok (buf, "\n"); 
+    freq = strtol (token, &ptr, 10); 
+    // fprintf (stderr, "\nRIGCTL VFO Freq: [%ld]\n", freq);
+    return freq;
+}
+
+bool SetFreq(int sockfd, long int freq)
+{
+    char buf[BUFSIZE];
+
+    sprintf (buf, "F %ld\n", freq); 
+    Send(sockfd, buf);
+    Recv(sockfd, buf);
+
+    if (strcmp(buf, "RPRT 1") == 0 )
+        return false;
+
+    return true;
+}
+
+bool SetModulation(int sockfd, int bandwidth) 
+{
+    char buf[BUFSIZE];
+    //the bandwidth is now a user/system based configurable variable
+    sprintf (buf, "M FM %d\n", bandwidth); 
+    Send(sockfd, buf);
+    Recv(sockfd, buf);
+
+    if (strcmp(buf, "RPRT 1") == 0 )
+        return false;
+
+    return true;
+}
+
+bool GetSignalLevel(int sockfd, double *dBFS)
+{
+    char buf[BUFSIZE];
+
+    Send(sockfd, "l\n");
+    Recv(sockfd, buf);
+
+    if (strcmp(buf, "RPRT 1") == 0 )
+        return false;
+
+    sscanf(buf, "%lf", dBFS);
+    *dBFS = round((*dBFS) * 10)/10;
+
+    if (*dBFS == 0.0)
+        return false;
+    return true;
+}
+
+bool GetSquelchLevel(int sockfd, double *dBFS)
+{
+    char buf[BUFSIZE];
+
+    Send(sockfd, "l SQL\n");
+    Recv(sockfd, buf);
+
+    if (strcmp(buf, "RPRT 1") == 0 )
+        return false;
+
+    sscanf(buf, "%lf", dBFS);
+    *dBFS = round((*dBFS) * 10)/10;
+
+    return true;
+}
+
+bool SetSquelchLevel(int sockfd, double dBFS)
+{
+    char buf[BUFSIZE];
+
+    sprintf (buf, "L SQL %f\n", dBFS);
+    Send(sockfd, buf);
+    Recv(sockfd, buf);
+
+    if (strcmp(buf, "RPRT 1") == 0 )
+        return false;
+
+    return true;
+}
+//
+// GetSignalLevelEx
+// Get a bunch of sample with some delay and calculate the mean value
+//
+bool GetSignalLevelEx(int sockfd, double *dBFS, int n_samp)
+{
+    double temp_level;
+    *dBFS = 0;
+    int errors = 0;
+    for (int i = 0; i < n_samp; i++)
+    {
+        if ( GetSignalLevel(sockfd, &temp_level) )
+            *dBFS = *dBFS + temp_level;
+        else
+            errors++;
+        usleep(1000);
+    }
+    *dBFS = *dBFS / (n_samp - errors);
+    return true;
+}
+
+//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;
+
+    /* socket: create the socket */
+    //UDP socket
+    sockfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
+
+    if (sockfd < 0)
+    {
+      fprintf(stderr,"ERROR opening UDP socket\n");
+      error("ERROR opening UDP socket");
+    }
+
+    /* build the server's Internet address */
+    bzero((char *) &serveraddr, sizeof(serveraddr));
+    serveraddr.sin_family = AF_INET;
+    serveraddr.sin_addr.s_addr = INADDR_ANY; //INADDR_ANY
+    serveraddr.sin_port = htons(portno);
+
+    //Bind socket to listening
+    if (bind(sockfd, (struct sockaddr *) &serveraddr,  sizeof(serveraddr)) < 0) { 
+		perror("ERROR on binding UDP Port");
+	}
+
+    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
+    struct sockaddr_in address;
+
+    uint32_t new_freq = frequency;
+    opts->rtlsdr_center_freq = new_freq; //for ncurses terminal display after rtl is started up
+
+    handle = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
+
+    data[0] = 0;
+    data[1] = new_freq & 0xFF;
+    data[2] = (new_freq >> 8) & 0xFF;
+    data[3] = (new_freq >> 16) & 0xFF;
+    data[4] = (new_freq >> 24) & 0xFF;
+
+    memset((char * ) & address, 0, sizeof(address));
+    address.sin_family = AF_INET;
+    address.sin_addr.s_addr = inet_addr("127.0.0.1"); //make user configurable later
+    address.sin_port = htons(udp_port);
+    sendto(handle, data, 5, 0, (const struct sockaddr * ) & address, sizeof(struct sockaddr_in));
+
+    close (handle); //close socket after sending.
+}
+
+int 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 320*2 -q -b 16 -r 8000 -c2 -t s16 -
+
+    //short 8k/1
+    //socat stdio udp-listen:23456 | play --buffer 160*2 -q -b 16 -r 48000 -c2 -t s16 -
+
+    //float 8k/2
+    //socat stdio udp-listen:23456 | play --buffer 320*4 -q -e float -b 32 -r 8000 -c2 -t f32 -
+
+    //float 8k/1
+    //socat stdio udp-listen:23456 | play --buffer 160*4 -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 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);
+    }
+
+}

src/dsd_serial.c

@@ -4,6 +4,7 @@
 void
 openSerial (dsd_opts * opts, dsd_state * state)
 {
+  UNUSED(state);
 
   struct termios tty;
   speed_t baud;
@@ -73,6 +74,7 @@ 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, sample2;
+  short sample;
   int i, sum, symbol, count;
   ssize_t result;
 
@@ -82,94 +105,296 @@ getSymbol (dsd_opts * opts, dsd_state * state, int have_sync)
         }
 
       // Read the new sample from the input
-      if(opts->audio_in_type == 0) // && state->menuopen == 0 still not quite working
+      if(opts->audio_in_type == 0) //pulse audio
       {
-          pa_simple_read(opts->pulse_digi_dev_in, &sample, 2, NULL );
+        pa_simple_read(opts->pulse_digi_dev_in, &sample, 2, NULL );
-          //look into how processAudio handles playback, not sure if latency issues, or garbage sample values crash pulse when written
+      }
-          // if (opts->monitor_input_audio == 1 && state->lastsynctype == -1 && sample < 32767 && sample > -32767)
-          if (opts->monitor_input_audio == 1 && state->lastsynctype == -1 && sample != 0)
-          {
-            state->pulse_raw_out_buffer = sample; //steal raw out buffer sample here?
-            pa_simple_write(opts->pulse_raw_dev_out, (void*)&state->pulse_raw_out_buffer, 2, NULL);
-          }
-          //playback is wrong, depends on samples_per_symbol, maybe make a buffer and store first?
-          //making buffer might also fix raw audio monitoring as well
-          if (opts->wav_out_file_raw[0] != 0) //if set for recording sample raw files
-          {
-            //writeRawSample (opts, state, sample);
-          }
 
+      else if (opts->audio_in_type == 5) //OSS
+      {
+        read (opts->audio_in_fd, &sample, 2);
       }
-      else if (opts->audio_in_type == 1) {
+
-          result = sf_read_short(opts->audio_in_file, &sample, 1);
+      //stdin only, wav files moving to new number
-          //fprintf (stderr, "..");
+      else if (opts->audio_in_type == 1) //won't work in windows, needs posix pipe (mintty)
-          if (opts->monitor_input_audio == 1 && state->lastsynctype == -1 && sample < 32767 && sample > -32767)
+      {
-          {
+        result = sf_read_short(opts->audio_in_file, &sample, 1);
-            state->pulse_raw_out_buffer = sample; //steal raw out buffer sample here?
+        if(result == 0)
-            pa_simple_write(opts->pulse_raw_dev_out, (void*)&state->pulse_raw_out_buffer, 2, NULL);
+        {
-          }
+          sf_close(opts->audio_in_file);
-          if(result == 0) {
+          cleanupAndExit (opts, state);
-              cleanupAndExit (opts, state);
+        }
-          }
       }
+      //wav files, same but using seperate value so we can still manipulate ncurses menu
+      //since we can not worry about getch/stdin conflict
       else if (opts->audio_in_type == 2)
       {
-#ifdef USE_PORTAUDIO
+        result = sf_read_short(opts->audio_in_file, &sample, 1);
-        PaError err = Pa_ReadStream( opts->audio_in_pa_stream, &sample, 1 );
+        if(result == 0)
-        if( err != paNoError )
         {
-              fprintf( stderr, "An error occured while using the portaudio input stream\n" );
+
-              fprintf( stderr, "Error number: %d\n", err );
+          sf_close(opts->audio_in_file);
-              fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
+          fprintf (stderr, "\nEnd of %s\n", opts->audio_in_dev);
+          //open pulse input if we are pulse output AND using ncurses terminal
+          if (opts->audio_out_type == 0 && opts->use_ncurses_terminal == 1)
+          {
+            opts->audio_in_type = 0; //set input type
+            openPulseInput(opts); //open pulse input
+          } 
+          //else cleanup and exit
+          else
+          {
+            cleanupAndExit(opts, state);     
+          }        
         }
-
+      }
-
-#endif
-	    }
       else if (opts->audio_in_type == 3)
       {
 #ifdef USE_RTLSDR
-        // TODO: need to read demodulated stream here
+        // Read demodulated stream here
-        // get_rtlsdr_sample(&sample);
+        if (get_rtlsdr_sample(&sample, opts, state) < 0)
-        get_rtlsdr_sample(&sample, opts, state);
+          cleanupAndExit(opts, state);
-        if (opts->monitor_input_audio == 1 && state->lastsynctype == -1 && sample < 32767 && sample > -32767)
+        //update root means square power level
-        {
+        opts->rtl_rms = rtl_return_rms();
-          state->pulse_raw_out_buffer = sample; //steal raw out buffer sample here?
-          pa_simple_write(opts->pulse_raw_dev_out, (void*)&state->pulse_raw_out_buffer, 2, NULL);
-        }
 
 #endif
       }
 
-#ifdef TRACE_DSD
+      //tcp socket input from SDR++ -- now with 1 retry if connection is broken
-      state->debug_sample_index++;
+      else if (opts->audio_in_type == 8)
-#endif
+      {
+        #ifdef AERO_BUILD
+        result = sf_read_short(opts->tcp_file_in, &sample, 1);
+        if(result == 0) {
+          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
+          sleep (3); //halt all processing and wait 3 seconds
+
+          //attempt to reconnect to socket
+          opts->tcp_sockfd = 0;  
+          opts->tcp_sockfd = Connect(opts->tcp_hostname, opts->tcp_portno);
+          if (opts->tcp_sockfd != 0)
+          {
+            //reset audio input stream
+            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->tcp_file_in = sf_open_fd(opts->tcp_sockfd, SFM_READ, opts->audio_in_file_info, 0);
+
+            if(opts->tcp_file_in == NULL)
+            {
+              fprintf(stderr, "Error, couldn't Reconnect to TCP with libsndfile: %s\n", sf_strerror(NULL));
+            }
+            else fprintf (stderr, "TCP Socket Reconnected Successfully.\n");
+          }
+          else fprintf (stderr, "TCP Socket Connection Error.\n");          
+
+          //now retry reading sample
+          result = sf_read_short(opts->tcp_file_in, &sample, 1);
+          if (result == 0) {
+            sf_close(opts->tcp_file_in);
+            opts->audio_in_type = 0; //set input type
+            opts->tcp_sockfd = 0; //added this line so we will know if it connected when using ncurses terminal keyboard shortcut
+            //openPulseInput(opts); //open pulse inpput
+            sample = 0; //zero sample on bad result, keep the ball rolling
+            //open pulse input if we are pulse output AND using ncurses terminal
+            if (opts->audio_out_type == 0 && opts->use_ncurses_terminal == 1)
+            {
+              fprintf (stderr, "Connection to TCP Server Disconnected.\n");
+              fprintf (stderr, "Opening Pulse Audio Input.\n");
+              opts->audio_in_type = 0; //set input type
+              openPulseInput(opts); //open pulse input
+            } 
+            //else cleanup and exit
+            else 
+            {
+              fprintf (stderr, "Connection to TCP Server Disconnected.\n");
+              fprintf (stderr, "Closing DSD-FME.\n");
+              cleanupAndExit(opts, state);
+            }
+            
+          }
+          
+        }
+        #else
+        result = sf_read_short(opts->tcp_file_in, &sample, 1);
+        if(result == 0) {
+          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
+          sleep (3); //halt all processing and wait 3 seconds
+
+          //attempt to reconnect to socket
+          opts->tcp_sockfd = 0;  
+          opts->tcp_sockfd = Connect(opts->tcp_hostname, opts->tcp_portno);
+          if (opts->tcp_sockfd != 0)
+          {
+            //reset audio input stream
+            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->tcp_file_in = sf_open_fd(opts->tcp_sockfd, SFM_READ, opts->audio_in_file_info, 0);
+
+            if(opts->tcp_file_in == NULL)
+            {
+              fprintf(stderr, "Error, couldn't Reconnect to TCP with libsndfile: %s\n", sf_strerror(NULL));
+            }
+            else fprintf (stderr, "TCP Socket Reconnected Successfully.\n");
+          }
+          else fprintf (stderr, "TCP Socket Connection Error.\n");          
+
+          //now retry reading sample
+          result = sf_read_short(opts->tcp_file_in, &sample, 1);
+          if (result == 0) {
+            sf_close(opts->tcp_file_in);
+            opts->audio_in_type = 0; //set input type
+            opts->tcp_sockfd = 0; //added this line so we will know if it connected when using ncurses terminal keyboard shortcut
+            openPulseInput(opts); //open pulse inpput
+            sample = 0; //zero sample on bad result, keep the ball rolling
+            fprintf (stderr, "Connection to TCP Server Disconnected.\n");
+          }
+          
+        }
+        #endif
+        
+      }
+
+      //reworked a bit to allow raw audio wav file saving without the monitoring poriton active 
+      if (have_sync == 0)
+      {
+
+        //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))
+        {
+          memset (state->analog_out, 0, sizeof(state->analog_out));
+          state->analog_sample_counter = 0;
+        }
+
+        //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)
+        {
+          //get an rms value if not using the rtl built in version
+          if (opts->audio_in_type != 3  && opts->monitor_input_audio == 1)
+            opts->rtl_rms = raw_rms(state->analog_out, 960, 1);
+
+          //debug
+          // opts->rtl_rms = 101;
+
+          //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) )
+          {
+            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_blaster (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)
+              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
+            state->last_cc_sync_time = time(NULL);
+            state->last_vc_sync_time = time(NULL);
+          }
+
+          //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);
+          }
+
+          memset (state->analog_out, 0, sizeof(state->analog_out));
+          state->analog_sample_counter = 0;
+        }
+
+      }
+
+      if (have_sync == 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;
+        }
+
+      }
 
-      // printf ("res: %zd\n, offset: %lld", result, sf_seek(opts->audio_in_file, 0, SEEK_CUR));
       if (opts->use_cosine_filter)
         {
-          if ( (state->lastsynctype >= 10 && state->lastsynctype <= 13) || state->lastsynctype == 32 || state->lastsynctype == 33 || state->lastsynctype == 34)
+          if ( (state->lastsynctype >= 10 && state->lastsynctype <= 13) || state->lastsynctype == 32 || state->lastsynctype == 33 
+                || state->lastsynctype == 34 || state->lastsynctype == 30 || state->lastsynctype == 31)
           {
             sample = dmr_filter(sample);
           }
 
-          else if (state->lastsynctype == 8  || state->lastsynctype == 9  ||
+          else if (state->lastsynctype == 8 || state->lastsynctype == 9 ||state->lastsynctype == 16 || state->lastsynctype == 17)
-               state->lastsynctype == 16 || state->lastsynctype == 17 ||
+          {
+            sample = m17_filter(sample);
+          }
+
+          else if ( 
                state->lastsynctype == 20 || state->lastsynctype == 21 ||
                state->lastsynctype == 22 || state->lastsynctype == 23 ||
                state->lastsynctype == 24 || state->lastsynctype == 25 ||
-               state->lastsynctype == 26 || state->lastsynctype == 27 ) //||
+               state->lastsynctype == 26 || state->lastsynctype == 27 ||
-               //state->lastsynctype == 35 || state->lastsynctype == 36) //phase 2
+               state->lastsynctype == 28 || state->lastsynctype == 29  ) //||
+               //state->lastsynctype == 35 || state->lastsynctype == 36) //phase 2 C4FM disc tap input
             {
-              if(state->samplesPerSymbol == 20)
+              //if(state->samplesPerSymbol == 20)
+              if(opts->frame_nxdn48 == 1)
               {
                 sample = nxdn_filter(sample);
               }
+              //else if (state->lastsynctype >= 20 && state->lastsynctype <=27) //this the right range?
+              else if (opts->frame_dpmr == 1)
+              {
+                sample = dpmr_filter(sample);
+              }
               else if (state->samplesPerSymbol == 8) //phase 2 cqpsk
               {
                 //sample = dmr_filter(sample); //work on filter later
               }
-              else // the 12.5KHz NXDN filter is the same as the DMR filter
+              else
               {
                 sample = dmr_filter(sample);
               }
@@ -254,7 +479,8 @@ 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 >= 9) && (i <= 11))
+          if ((i >= 7) && (i <= 13)) //7, 13 working good on multiple nxdn48, fewer random errors
             {
               sum += sample;
               count++;
@@ -273,12 +499,24 @@ 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 ((i >= state->symbolCenter - 1) && (i <= state->symbolCenter + 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;
-                  sum += sample;
+              else l_edge = 2; //P25 and NXDN96 perform better, DMR doesn't seem to care too much, but may favor 1 and not 2
-                  count++;
+
-                }
+              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);
 
 #ifdef TRACE_DSD
               if (i == state->symbolCenter - 1) {
@@ -289,7 +527,18 @@ getSymbol (dsd_opts * opts, dsd_state * state, int have_sync)
               }
 #endif
             }
-          else
+            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
             {
               // 1: QPSK modulation
               // 2: GFSK modulation
@@ -298,12 +547,23 @@ 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))
+              // 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 - 1) || (i == state->symbolCenter + 1))
-                {
+              {
-                  sum += sample;
+                sum += sample;
-                  count++;
+                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
 
 #ifdef TRACE_DSD
               //if (i == state->symbolCenter) {
@@ -356,6 +616,12 @@ getSymbol (dsd_opts * opts, dsd_state * state, int have_sync)
   }
 #endif
 
+  //test throttle on wav input files
+	if (opts->audio_in_type == 2)
+	{
+		if (state->use_throttle == 1) usleep(.003); //very environment specific, tuning to cygwin
+	}
+
   //read op25/fme symbol bin files
   if (opts->audio_in_type == 4)
   {
@@ -369,28 +635,40 @@ 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)
     {
-      usleep(stime);
+      // useconds_t stime = state->symbol_throttle;
+      // usleep(stime);
+      usleep(.003); //very environment specific, tuning to cygwin
     }
     //fprintf(stderr, "%d", state->symbolc);
     if( feof(opts->symbolfile) )
     {
-      opts->audio_in_type = 0; //switch to pulse after playback, ncurses terminal can initiate replay if wanted
+      // opts->audio_in_type = 0; //switch to pulse after playback, ncurses terminal can initiate replay if wanted
       fclose(opts->symbolfile);
-      openPulseInput(opts);
+      fprintf (stderr, "\nEnd of %s\n", opts->audio_in_dev);
+      //open pulse input if we are pulse output AND using ncurses terminal
+      if (opts->audio_out_type == 0 && opts->use_ncurses_terminal == 1)
+      {
+        opts->audio_in_type = 0; //set input type
+        openPulseInput(opts); //open pulse input
+      } 
+      //else cleanup and exit
+      else
+      {
+        cleanupAndExit(opts, state);
+      }
     }
 
     //assign symbol/dibit values based on modulation type
     if (state->rf_mod == 2) //GFSK
     {
       symbol = state->symbolc;
-      if (state->symbolc == 0 && state->synctype >= 0)
+      if (state->symbolc == 0 ) 
       {
         symbol = -3; //-1
       }
-      if (state->symbolc == 1 && state->synctype >= 0)
+      if (state->symbolc == 1 ) 
       {
         symbol = -1; //-3
       }

src/dsd_upsample.c

@@ -54,79 +54,105 @@ upsample (dsd_state * state, float invalue)
   *outbuf1 = d;
   outbuf1++;
 
-  if (state->currentslot == 1 && state->dmr_stereo == 1)
+  //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->audio_out_idx2R > 24)
+    if (state->currentslot == 1 && state->dmr_stereo == 1)
     {
-      // smoothing
+      if (state->audio_out_idx2R > 24)
-      outbuf1 -= 16;
-      for (j = 0; j < 4; j++)
       {
-          for (i = 0; i < 6; i++)
+        // 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++)
           {
-            sum = 0;
+            for (i = 0; i < 6; i++)
-            outbuf1 -= 2;
+              {
-            sum += (int)*outbuf1;
+                sum = 0;
-            outbuf1 += 2;
+                outbuf1 -= 2;
-            sum += (int)*outbuf1;
+                sum += (int)*outbuf1;
-            outbuf1 += 2;
+                outbuf1 += 2;
-            sum += (int)*outbuf1;
+                sum += (int)*outbuf1;
-            outbuf1 -= 2;
+                outbuf1 += 2;
-            *outbuf1 = (sum / (float) 3);
+                sum += (int)*outbuf1;
-            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;
           }
-        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;
-        }
-    }
-  }
 }
+
+//produce 6 short samples (48k) for every 1 short sample (8k)
+void upsampleS (short invalue, short prev, short outbuf[6])
+{
+
+  float c, d;
+
+  c = prev;
+  d = invalue;
+
+  // basic triangle interpolation
+  outbuf[0] = c = ((invalue * (float) 0.166) + (c * (float) 0.834));
+  outbuf[1] = c = ((invalue * (float) 0.332) + (c * (float) 0.668));
+  outbuf[2] = c = ((invalue * (float) 0.500) + (c * (float) 0.5));
+  outbuf[3] = c = ((invalue * (float) 0.668) + (c * (float) 0.332));
+  outbuf[4] = c = ((invalue * (float) 0.834) + (c * (float) 0.166));
+  outbuf[5] = c = d;
+  prev = d; //shift prev to the last d value for the next repitition
+
+}

src/dstar.c

@@ -1,183 +1,397 @@
-/*
- * 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 "dstar_header.h"
+#include "fcs.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;
 
-void processDSTAR(dsd_opts * opts, dsd_state * state) {
+  //20 voice and 19 slow data frames (20th is frame sync)
-	// extracts AMBE frames from D-STAR voice frame
+  for (j = 0; j < 21; j++)
-	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;
 
-	//set carrier to 1 so ncurses will light up green
+    memset(ambe_fr, 0, sizeof(ambe_fr));
-	state->carrier = 1;
+    w = dW;
+    x = dX;
 
-	if (opts->errorbars == 1) {
+    for (i = 0; i < 72; i++)
-		fprintf (stderr, "e:");
+    {
-	}
+      dibit = getDibit(opts, state);
+      ambe_fr[*w][*x] = dibit & 1;
+      w++;
+      x++;
+    }
 
-#ifdef DSTAR_DUMP
+    soft_mbe(opts, state, NULL, ambe_fr, NULL);
-	fprintf (stderr, "\n");
-#endif
 
-	if (state->synctype == 18) {
+    if (j != 20)
-		framecount = 0;
+    {
-		state->synctype = 6;
+      for (i = 0; i < 24; i++)
-	} else if (state->synctype == 19) {
+      {
-		framecount = 0;
+        //slow data
-		state->synctype = 7;
+        sd[(j*24)+i] = (uint8_t) getDibit(opts, state);
-	} 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;
 
-		for (i = 0; i < 72; i++) {
+    if (j == 20)
+      processDSTAR_SD(opts, state, sd);
 
-			dibit = getDibit(opts, state);
+    //since we are in a long loop, use this to improve response time in ncurses
+    if (opts->use_ncurses_terminal == 1)
+      ncursesPrinter(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;
-			}
 
-			ambe_fr[*w][*x] = (1 & dibit);
+  fprintf (stderr, "\n");
-			w++;
+
-			x++;
+}
-
+
-		}
+void processDSTAR_HD(dsd_opts * opts, dsd_state * state)
-
+{
-
+
-		processMbeFrame(opts, state, NULL, ambe_fr, NULL);
+  int i;
-
+  int radioheaderbuffer[660];
-		//  data frame - 24 bits
+
-		for (i = 73; i < 97; i++) {
+  for (i = 0; i < 660; i++)
-			dibit = getDibit(opts, state);
+    radioheaderbuffer[i] = getDibit(opts, state);
-			bitbuffer <<= 1;
+
-			if (dibit == 1) {
+  dstar_header_decode(state, radioheaderbuffer);
-				bitbuffer |= 0x01;
+  processDSTAR(opts, state);
-			}
+
-			if ((bitbuffer & 0x00FFFFFF) == 0x00AAB468) {
+}
-				// looking if we're slipping bits
+
-				if (i != 96) {
+//first 24-bits of the larger scramble table
-					fprintf (stderr, "sync after i=%d\n", i);
+uint8_t sd_d[48] = 
-					i = 96;
+{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
-		slowdata[0] = (bitbuffer >> 16) & 0x000000FF;
+ 1,0,0,1};//9
-		slowdata[1] = (bitbuffer >> 8) & 0x000000FF;
+
-		slowdata[2] = (bitbuffer) & 0x000000FF;
+//no so simplified Slow Data
-		slowdata[3] = 0;
+void processDSTAR_SD(dsd_opts * opts, dsd_state * state, uint8_t * sd)
-
+{
-		if ((bitbuffer & 0x00FFFFFF) == 0x00AAB468) {
+
-			//We got sync!
+  int i, j, len;
-			//fprintf (stderr, "Sync on framecount = %d\n", framecount);
+  uint8_t sd_bytes[60]; //raw slow data packed into bytes
-			sync_missed = 0;
+  uint8_t hd_bytes[60]; //storage for packed bytes sans the header indicator byte (0x55)
-		} else if ((bitbuffer & 0x00FFFFFF) == 0xAAAAAA) {
+  uint8_t payload[60]; //unchanged copy of sd_bytes for payload printing
-			//End of transmission
+  uint8_t rev[480]; //storage for reversing the bit order
-			fprintf (stderr, "End of transmission\n");
+  memset (sd_bytes, 0, sizeof(sd_bytes));
-			goto end;
+  memset (hd_bytes, 0, sizeof(hd_bytes));
-		} else if (framecount % 21 == 0) {
+  memset (payload, 0, sizeof(payload));
-			fprintf (stderr, "Missed sync on framecount = %d, value = %x/%x/%x\n",
+
-					framecount, slowdata[0], slowdata[1], slowdata[2]);
+  //apply the descrambler
-			sync_missed++;
+  for (i = 0; i < 480; i++)
-		} else if (framecount != 0 && (bitbuffer & 0x00FFFFFF) != 0x000000) {
+    sd[i] ^= sd_d[i%24];
-			slowdata[0] ^= 0x70;
+
-			slowdata[1] ^= 0x4f;
+  //reverse the bit order
-			slowdata[2] ^= 0x93;
+  for (i = 0; i < 480; i++)
-			//fprintf (stderr, "unscrambled- %02X %02X %02X %02X \n", slowdata[0], slowdata[1], slowdata[2], slowdata[3] );
+    rev[i] = sd[479-i];
-
+  for (i = 0; i < 480; i++)
-		} else if (framecount == 0) {
+    sd[i] = rev[i];
-			//fprintf (stderr, "never scrambled-%c\n",slowdata);
+
-			//fprintf (stderr, "never scrambled- %02X %02X %02X %02X \n", slowdata[0], slowdata[1], slowdata[2], slowdata[3] );
+  //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++)
-		for (short int i = 0; i < 4; i++)
+    sd_bytes[59-i] = (uint8_t)ConvertBitIntoBytes(&sd[i*8+0], 8);
-		{
+
-			if (slowdata[i] <= 0x7E && slowdata[i] >=0x20)
+  //make a copy to payload that won't be altered
-	     {
+  memcpy (payload, sd_bytes, sizeof(payload));
-	       //fprintf (stderr, "%c", slowdata[i]);
+
-	     }
+  len = sd_bytes[0] & 0xF;
-	     //else fprintf (stderr, ".");
+  len += 1;
-		}
+
-		//fprintf (stderr, "\n");
+  //load payload bytes without the header indicator byte
-		framecount++;
+  for (i = 0, j = 0; i < 50; i++)
-
+  {
-		//since we are in a while loop, run ncursesPrinter here.
+    j++;
-	  if (opts->use_ncurses_terminal == 1)
+    hd_bytes[i] = sd_bytes[j];
-	  {
+    if (j == len*1-1)  j++;
-	    ncursesPrinter(opts, state);
+    if (j == len*2-1)  j++;
-	  }
+    if (j == len*3-1)  j++;
-
+    if (j == len*4-1)  j++;
-	} //end while loop
+    if (j == len*5-1)  j++;
-
+    if (j == len*6-1)  j++;
-	end: if (opts->errorbars == 1) {
+    if (j == len*7-1)  j++;
-		fprintf (stderr, "\n");
+    if (j == len*8-1)  j++;
-	}
+    if (j == len*9-1)  j++;
-}
+  }
-
+
-void processDSTAR_HD(dsd_opts * opts, dsd_state * state) {
+  //works on header format -- may not work on others
-
+  uint16_t crc_ext = (hd_bytes[39] << 8) + hd_bytes[40];
-	int i, j;
+  uint16_t crc_cmp = calc_fcs(hd_bytes, 39);
-	int radioheaderbuffer[660];
+
-
+  char str1[9];
-	for (j = 0; j < 660; j++) {
+  char str2[9];
-					radioheaderbuffer[j] = getDibit(opts, state);
+  char str3[9];
-			}
+  char str4[13];
-
+  char strf[60];
-	// Note: These routines contain GPLed code. Remove if you object to that.
+  char strt[60];
-	// Due to this, they are in a separate source file.
+  memset (strf, 0x20, sizeof(strf));
-	dstar_header_decode(state, radioheaderbuffer);
+  memset (strt, 0x20, sizeof(strf));
-
+  memcpy (str1, hd_bytes+3,  8);
-	//We officially have sync now, so just pass on to the above routine:
+  memcpy (str2, hd_bytes+11, 8);
-
+  memcpy (str3, hd_bytes+19, 8);
-	processDSTAR(opts, state);
+  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);
+  }
 
 }

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,75 +13,84 @@
 * 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];
-	unsigned char radioheader[41];
+	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);
-	len = FECdecoder(radioheaderbuffer, radioheaderbuffer2);
+	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++) {
+	for (loop = 0; loop < 328; loop++)
-		if (radioheaderbuffer2[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;
 
-	for (short i = 0; i < 41; i++)
+	char str1[9];
-	{
+	char str2[9];
-		state->dstarradioheader[i] = radioheader[i];
+	char str3[9];
-	}
+	char str4[13];
 
+	memcpy (str1, radioheader+3, 8);
+	memcpy (str2, radioheader+11, 8);
+	memcpy (str3, radioheader+19, 8);
+	memcpy (str4, radioheader+27, 12);
 
-	// print header
+	str1[8] = '\0';
-	fprintf (stderr, "\nDSTAR HEADER: ");
+	str2[8] = '\0';
-	//fprintf (stderr, "FLAG1: %02X - FLAG2: %02X - FLAG3: %02X\n", radioheader[0],
+	str3[8] = '\0';
-	//		radioheader[1], radioheader[2]);
+	str4[12] = '\0';
-	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]);
 
-	//FCSinheader = ((radioheader[39] << 8) | radioheader[40]) & 0xFFFF;
+	//TODO: Add fcs_calc to header as well
-	//FCScalculated = calc_fcs((unsigned char*) radioheader, 39);
+	// uint16_t crc_ext = (radioheader[39] << 8) + radioheader[40];
-	//fprintf (stderr, "Check sum = %04X ", FCSinheader);
+	// uint16_t crc_cmp = calc_fcs(radioheader, 39);
-	//if (FCSinheader == FCScalculated) {
+
-	//	fprintf (stderr, "(OK)\n");
+	//debug
-	//} else {
+	// fprintf (stderr, "\n HD: ");
-	//	fprintf (stderr, "(NOT OK- Calculated FCS = %04X)\n", FCScalculated);
+	// for (int i = 0; i < 40; i++)
-	//}; // end else - if
+	// 	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
 }

src/edacs-bch3.c

@@ -0,0 +1,519 @@
+/*
+ * File:    bch3.h
+ * Title:   Encoder/decoder for binary BCH codes in C (Version 3.1)
+ * Author:  Robert Morelos-Zaragoza
+ * Date:    August 1994-June 13, 1997
+ * Mod:     December 14, 2021, for EDACS-FM BCH Polynomial Error Generation and Detection
+ * Mod2:    October 2022, for DSD-FME port of EDACS-FM
+ * Source:  www.eccpage.com
+ * 
+ * ===============  Encoder/Decoder for binary BCH codes in C =================
+ *
+ * Version 1:   Original program. The user provides the generator polynomial
+ *              of the code (cumbersome!).
+ * Version 2:   Computes the generator polynomial of the code.
+ * Version 3:   No need to input the coefficients of a primitive polynomial of
+ *              degree m, used to construct the Galois Field GF(2**m). The
+ *              program now works for any binary BCH code of length such that:
+ *              2**(m-1) - 1 < length <= 2**m - 1
+ *
+ * Note:        You may have to change the size of the arrays to make it work.
+ *
+ * The encoding and decoding methods used in this program are based on the
+ * book "Error Control Coding: Fundamentals and Applications", by Lin and
+ * Costello, Prentice Hall, 1983.
+ *
+ * Thanks to Patrick Boyle (pboyle@era.com) for his observation that 'bch2.c'
+ * did not work for lengths other than 2**m-1 which led to this new version.
+ * Portions of this program are from 'rs.c', a Reed-Solomon encoder/decoder
+ * in C, written by Simon Rockliff (simon@augean.ua.oz.au) on 21/9/89. The
+ * previous version of the BCH encoder/decoder in C, 'bch2.c', was written by
+ * Robert Morelos-Zaragoza (robert@spectra.eng.hawaii.edu) on 5/19/92.
+ *
+ * NOTE:    
+ *          The author is not responsible for any malfunctioning of
+ *          this program, nor for any damage caused by it. Please include the
+ *          original program along with these comments in any redistribution.
+ *
+ *  For more information, suggestions, or other ideas on implementing error
+ *  correcting codes, please contact me at:
+ *
+ *                           Robert Morelos-Zaragoza
+ *                           5120 Woodway, Suite 7036
+ *                           Houston, Texas 77056
+ *
+ *                    email: r.morelos-zaragoza@ieee.org
+ *
+ * COPYRIGHT NOTICE: This computer program is free for non-commercial purposes.
+ * You may implement this program for any non-commercial application. You may 
+ * also implement this program for commercial purposes, provided that you
+ * obtain my written permission. Any modification of this program is covered
+ * by this copyright.
+ *
+ * == Copyright (c) 1994-7,  Robert Morelos-Zaragoza. All rights reserved.  ==
+ *
+ * m = order of the Galois field GF(2**m) 
+ * n = 2**m - 1 = size of the multiplicative group of GF(2**m)
+ * length = length of the BCH code
+ * t = error correcting capability (max. no. of errors the code corrects)
+ * d = 2*t + 1 = designed min. distance = no. of consecutive roots of g(x) + 1
+ * k = n - deg(g(x)) = dimension (no. of information bits/codeword) of the code
+ * p[] = coefficients of a primitive polynomial used to generate GF(2**m)
+ * g[] = coefficients of the generator polynomial, g(x)
+ * alpha_to [] = log table of GF(2**m) 
+ * index_of[] = antilog table of GF(2**m)
+ * ddata[] = information bits = coefficients of data polynomial, i(x)
+ * bb[] = coefficients of redundancy polynomial x^(length-k) i(x) modulo g(x)
+ * numerr = number of errors 
+ * errpos[] = error positions 
+ * recd[] = coefficients of the received polynomial 
+ * decerror = number of decoding errors (in _message_ positions) 
+ *
+ */
+
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int             m, n, length, k, t, d;
+int             p[21];
+int             alpha_to[1048576], index_of[1048576], g[548576];
+int             recd[1048576], ddata[1048576], bb[548576];
+int             seed;
+int             numerr, errpos[1024], decerror = 0;
+
+
+void 
+read_p()
+/*
+ *	Read m, the degree of a primitive polynomial p(x) used to compute the
+ *	Galois field GF(2**m). Get precomputed coefficients p[] of p(x). Read
+ *	the code length.
+ */
+{
+	int			i, ninf;
+
+    do {
+
+	   m = 6;
+    } while ( !(m>1) || !(m<21) );
+	for (i=1; i<m; i++)
+		p[i] = 0;
+	p[0] = p[m] = 1;
+	if (m == 2)			p[1] = 1;
+	else if (m == 3)	p[1] = 1;
+	else if (m == 4)	p[1] = 1;
+	else if (m == 5)	p[2] = 1;
+	else if (m == 6)	p[1] = 1;
+	else if (m == 7)	p[1] = 1;
+	else if (m == 8)	p[4] = p[5] = p[6] = 1;
+	else if (m == 9)	p[4] = 1;
+	else if (m == 10)	p[3] = 1;
+	else if (m == 11)	p[2] = 1;
+	else if (m == 12)	p[3] = p[4] = p[7] = 1;
+	else if (m == 13)	p[1] = p[3] = p[4] = 1;
+	else if (m == 14)	p[1] = p[11] = p[12] = 1;
+	else if (m == 15)	p[1] = 1;
+	else if (m == 16)	p[2] = p[3] = p[5] = 1;
+	else if (m == 17)	p[3] = 1;
+	else if (m == 18)	p[7] = 1;
+	else if (m == 19)	p[1] = p[5] = p[6] = 1;
+	else if (m == 20)	p[3] = 1;
+
+    n = 1;
+	for (i = 0; i <= m; i++) {
+        n *= 2;
+        }
+	n = n / 2 - 1;
+	ninf = (n + 1) / 2 - 1;
+	
+	do  {
+
+		length = 40;
+	} while ( !((length <= n)&&(length>ninf)) );
+}
+
+
+void 
+generate_gf()
+/*
+ * Generate field GF(2**m) from the irreducible polynomial p(X) with
+ * coefficients in p[0]..p[m].
+ *
+ * Lookup tables:
+ *   index->polynomial form: alpha_to[] contains j=alpha^i;
+ *   polynomial form -> index form:	index_of[j=alpha^i] = i
+ *
+ * alpha=2 is the primitive element of GF(2**m) 
+ */
+{
+	register int    i, mask;
+
+	mask = 1;
+	alpha_to[m] = 0;
+	for (i = 0; i < m; i++) {
+		alpha_to[i] = mask;
+		index_of[alpha_to[i]] = i;
+		if (p[i] != 0)
+			alpha_to[m] ^= mask;
+		mask <<= 1;
+	}
+	index_of[alpha_to[m]] = m;
+	mask >>= 1;
+	for (i = m + 1; i < n; i++) {
+		if (alpha_to[i - 1] >= mask)
+		  alpha_to[i] = alpha_to[m] ^ ((alpha_to[i - 1] ^ mask) << 1);
+		else
+		  alpha_to[i] = alpha_to[i - 1] << 1;
+		index_of[alpha_to[i]] = i;
+	}
+	index_of[0] = -1;
+}
+
+
+void 
+gen_poly()
+/*
+ * Compute the generator polynomial of a binary BCH code. Fist generate the
+ * cycle sets modulo 2**m - 1, cycle[][] =  (i, 2*i, 4*i, ..., 2^l*i). Then
+ * determine those cycle sets that contain integers in the set of (d-1)
+ * consecutive integers {1..(d-1)}. The generator polynomial is calculated
+ * as the product of linear factors of the form (x+alpha^i), for every i in
+ * the above cycle sets.
+ */
+{
+	register int	ii, jj, ll, kaux;
+	register int	test, aux, nocycles, root, noterms, rdncy;
+	int             cycle[1024][21], size[1024], min[1024], zeros[1024];
+
+	/* Generate cycle sets modulo n, n = 2**m - 1 */
+	cycle[0][0] = 0;
+	size[0] = 1;
+	cycle[1][0] = 1;
+	size[1] = 1;
+	jj = 1;			/* cycle set index */
+	if (m > 9)  {
+
+	}
+	do {
+		/* Generate the jj-th cycle set */
+		ii = 0;
+		do {
+			ii++;
+			cycle[jj][ii] = (cycle[jj][ii - 1] * 2) % n;
+			size[jj]++;
+			aux = (cycle[jj][ii] * 2) % n;
+		} while (aux != cycle[jj][0]);
+		/* Next cycle set representative */
+		ll = 0;
+		do {
+			ll++;
+			test = 0;
+			for (ii = 1; ((ii <= jj) && (!test)); ii++)	
+			/* Examine previous cycle sets */
+			  for (kaux = 0; ((kaux < size[ii]) && (!test)); kaux++)
+			     if (ll == cycle[ii][kaux])
+			        test = 1;
+		} while ((test) && (ll < (n - 1)));
+		if (!(test)) {
+			jj++;	/* next cycle set index */
+			cycle[jj][0] = ll;
+			size[jj] = 1;
+		}
+	} while (ll < (n - 1));
+	nocycles = jj;		/* number of cycle sets modulo n */
+
+	t = 2;
+
+	d = 2 * t + 1;
+
+	/* Search for roots 1, 2, ..., d-1 in cycle sets */
+	kaux = 0;
+	rdncy = 0;
+	for (ii = 1; ii <= nocycles; ii++) {
+		min[kaux] = 0;
+		test = 0;
+		for (jj = 0; ((jj < size[ii]) && (!test)); jj++)
+			for (root = 1; ((root < d) && (!test)); root++)
+				if (root == cycle[ii][jj])  {
+					test = 1;
+					min[kaux] = ii;
+				}
+		if (min[kaux]) {
+			rdncy += size[min[kaux]];
+			kaux++;
+		}
+	}
+	noterms = kaux;
+	kaux = 1;
+	for (ii = 0; ii < noterms; ii++)
+		for (jj = 0; jj < size[min[ii]]; jj++) {
+			zeros[kaux] = cycle[min[ii]][jj];
+			kaux++;
+		}
+
+	k = length - rdncy;
+
+    if (k<0)
+      {
+         exit(0);
+      }
+
+	/* Compute the generator polynomial */
+	g[0] = alpha_to[zeros[1]];
+	g[1] = 1;		/* g(x) = (X + zeros[1]) initially */
+	for (ii = 2; ii <= rdncy; ii++) {
+	  g[ii] = 1;
+	  for (jj = ii - 1; jj > 0; jj--)
+	    if (g[jj] != 0)
+	      g[jj] = g[jj - 1] ^ alpha_to[(index_of[g[jj]] + zeros[ii]) % n];
+	    else
+	      g[jj] = g[jj - 1];
+	  g[0] = alpha_to[(index_of[g[0]] + zeros[ii]) % n];
+	}
+}
+
+
+void 
+encode_bch()
+/*
+ * Compute redundacy bb[], the coefficients of b(x). The redundancy
+ * polynomial b(x) is the remainder after dividing x^(length-k)*ddata(x)
+ * by the generator polynomial g(x).
+ */
+{
+	register int    i, j;
+	register int    feedback;
+
+	for (i = 0; i < length - k; i++)
+		bb[i] = 0;
+	for (i = k - 1; i >= 0; i--) {
+		feedback = ddata[i] ^ bb[length - k - 1];
+		if (feedback != 0) {
+			for (j = length - k - 1; j > 0; j--)
+				if (g[j] != 0)
+					bb[j] = bb[j - 1] ^ feedback;
+				else
+					bb[j] = bb[j - 1];
+			bb[0] = g[0] && feedback;
+		} else {
+			for (j = length - k - 1; j > 0; j--)
+				bb[j] = bb[j - 1];
+			bb[0] = 0;
+		}
+	}
+}
+
+
+void 
+decode_bch()
+/*
+ * Simon Rockliff's implementation of Berlekamp's algorithm.
+ *
+ * Assume we have received bits in recd[i], i=0..(n-1).
+ *
+ * Compute the 2*t syndromes by substituting alpha^i into rec(X) and
+ * evaluating, storing the syndromes in s[i], i=1..2t (leave s[0] zero) .
+ * Then we use the Berlekamp algorithm to find the error location polynomial
+ * elp[i].
+ *
+ * If the degree of the elp is >t, then we cannot correct all the errors, and
+ * we have detected an uncorrectable error pattern. We output the information
+ * bits uncorrected.
+ *
+ * If the degree of elp is <=t, we substitute alpha^i , i=1..n into the elp
+ * to get the roots, hence the inverse roots, the error location numbers.
+ * This step is usually called "Chien's search".
+ *
+ * If the number of errors located is not equal the degree of the elp, then
+ * the decoder assumes that there are more than t errors and cannot correct
+ * them, only detect them. We output the information bits uncorrected.
+ */
+{
+	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);
+
+	t2 = 2 * t;
+
+	/* first form the syndromes */
+	for (i = 1; i <= t2; i++) {
+		s[i] = 0;
+		for (j = 0; j < length; j++)
+			if (recd[j] != 0)
+				s[i] ^= alpha_to[(i * j) % n];
+		if (s[i] != 0)
+			syn_error = 1; /* set error flag if non-zero syndrome */
+/*
+ * Note:    If the code is used only for ERROR DETECTION, then
+ *          exit program here indicating the presence of errors.
+ */
+		/* convert syndrome from polynomial form to index form  */
+		s[i] = index_of[s[i]];
+	}
+
+	if (syn_error) {	/* if there are errors, try to correct them */
+		/*
+		 * Compute the error location polynomial via the Berlekamp
+		 * iterative algorithm. Following the terminology of Lin and
+		 * Costello's book :   d[u] is the 'mu'th discrepancy, where
+		 * u='mu'+1 and 'mu' (the Greek letter!) is the step number
+		 * ranging from -1 to 2*t (see L&C),  l[u] is the degree of
+		 * the elp at that step, and u_l[u] is the difference between
+		 * the step number and the degree of the elp. 
+		 */
+		/* initialise table entries */
+		d[0] = 0;			/* index form */
+		d[1] = s[1];		/* index form */
+		elp[0][0] = 0;		/* index form */
+		elp[1][0] = 1;		/* polynomial form */
+		for (i = 1; i < t2; i++) {
+			elp[0][i] = -1;	/* index form */
+			elp[1][i] = 0;	/* polynomial form */
+		}
+		l[0] = 0;
+		l[1] = 0;
+		u_lu[0] = -1;
+		u_lu[1] = 0;
+		u = 0;
+ 
+		do {
+			u++;
+			if (d[u] == -1) {
+				l[u + 1] = l[u];
+				for (i = 0; i <= l[u]; i++) {
+					elp[u + 1][i] = elp[u][i];
+					elp[u][i] = index_of[elp[u][i]];
+				}
+			} else
+				/*
+				 * search for words with greatest u_lu[q] for
+				 * which d[q]!=0 
+				 */
+			{
+				q = u - 1;
+				while ((d[q] == -1) && (q > 0))
+					q--;
+				/* have found first non-zero d[q]  */
+				if (q > 0) {
+				  j = q;
+				  do {
+				    j--;
+				    if ((d[j] != -1) && (u_lu[q] < u_lu[j]))
+				      q = j;
+				  } while (j > 0);
+				}
+ 
+				/*
+				 * have now found q such that d[u]!=0 and
+				 * u_lu[q] is maximum 
+				 */
+				/* store degree of new elp polynomial */
+				if (l[u] > l[q] + u - q)
+					l[u + 1] = l[u];
+				else
+					l[u + 1] = l[q] + u - q;
+ 
+				/* form new elp(x) */
+				for (i = 0; i < t2; i++)
+					elp[u + 1][i] = 0;
+				for (i = 0; i <= l[q]; i++)
+					if (elp[q][i] != -1)
+						elp[u + 1][i + u - q] = 
+                                   alpha_to[(d[u] + n - d[q] + elp[q][i]) % n];
+				for (i = 0; i <= l[u]; i++) {
+					elp[u + 1][i] ^= elp[u][i];
+					elp[u][i] = index_of[elp[u][i]];
+				}
+			}
+			u_lu[u + 1] = u - l[u + 1];
+ 
+			/* form (u+1)th discrepancy */
+			if (u < t2) {	
+			/* no discrepancy computed on last iteration */
+			  if (s[u + 1] != -1)
+			    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];
+			  /* put d[u+1] into index form */
+			  d[u + 1] = index_of[d[u + 1]];	
+			}
+		} while ((u < t2) && (l[u + 1] <= t));
+ 
+		u++;
+		if (l[u] <= t) {/* Can correct errors */
+			/* put elp into index form */
+			for (i = 0; i <= l[u]; i++)
+				elp[u][i] = index_of[elp[u][i]];
+
+			for (i = 0; i <= l[u]; i++)
+
+			/* Chien search: find roots of the error location polynomial */
+			for (i = 1; i <= l[u]; i++)
+				reg[i] = elp[u][i];
+			count = 0;
+			for (i = 1; i <= n; i++) {
+				q = 1;
+				for (j = 1; j <= l[u]; j++)
+					if (reg[j] != -1) {
+						reg[j] = (reg[j] + j) % n;
+						q ^= alpha_to[reg[j]];
+					}
+				if (!q) {	/* store root and error
+						 * location number indices */
+					root[count] = i;
+					loc[count] = n - i;
+					count++;
+				}
+			}
+
+			if (count == l[u])	
+			/* no. roots = degree of elp hence <= t errors */
+				for (i = 0; i < l[u]; i++)
+					recd[loc[i]] ^= 1;
+
+		}
+	}
+}
+
+//bugfix on 32-bit cygwin, probably overflowed here
+unsigned long long int messagepp = 0x0;
+
+//very simplified version, just to encode, get frame and compare
+unsigned long long int edacs_bch (unsigned long long int message)
+{
+	int             i;
+	//not ideal to run these every frame, will want to eventually run once on start of DSD-FME, and store values
+	read_p();               /* Read m */
+	generate_gf();          /* Construct the Galois Field GF(2**m) */
+	gen_poly();             /* Compute the generator polynomial of BCH code */
+	//test shows this works, but output from program is that the poly is backwards, not sure if it corrects okay though
+	  for (i = 0; i < k; i++){
+		  ddata[i] = ( (message >> i) & 0x1 ); //loaded up backwards? or just outputs backwards?
+	  }
+	  
+	
+	encode_bch();           /* encode data */
+
+	/*
+	 * recd[] are the coefficients of c(x) = x**(length-k)*data(x) + b(x)
+	 */
+	for (i = 0; i < length - k; i++)
+		recd[i] = bb[i];
+	for (i = 0; i < k; i++)
+		recd[i + length - k] = ddata[i];
+
+	for (i = 0; i < length; i++) {
+		messagepp = (messagepp << 1) | recd[39-i]; //get it in the correct direction
+	}
+
+  return (messagepp);
+
+}
+
+

src/edacs-fme.c

@@ -0,0 +1,781 @@
+/*-------------------------------------------------------------------------------
+ * EDACS-FME 
+ * A program for decoding EDACS (ported to DSD-FME)
+ * https://github.com/lwvmobile/edacs-fm
+ *
+ * Portions of this software originally from:
+ * https://github.com/sp5wwp/ledacs
+ * XTAL Labs
+ * 30 IV 2016
+ * Many thanks to SP5WWP for permission to use and modify this software
+ *
+ * Encoder/decoder for binary BCH codes in C (Version 3.1)
+ * Robert Morelos-Zaragoza
+ * 1994-7
+ *
+ * LWVMOBILE
+ * 2023-11 Version EDACS-FM Florida Man Edition
+ *-----------------------------------------------------------------------------*/
+#include "dsd.h"
+
+char * getDateE(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;
+}
+
+//fix from YorgosTheodorakis fork -- https://github.com/YorgosTheodorakis/dsd-fme/commit/7884ee555521a887d388152b3b1f11f20433a94b
+char * getTimeE(void) //get pretty hhmmss timestamp
+{
+  char * curr = (char *) malloc(9);
+  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;
+}
+
+void openWavOutFile48k (dsd_opts * opts, dsd_state * state)
+{
+  UNUSED(state);
+  SF_INFO info;
+  info.samplerate = 48000; //48k for analog output (has to match input)
+  info.channels = 1;
+  info.format = SF_FORMAT_WAV | SF_FORMAT_PCM_16 | SF_ENDIAN_LITTLE;
+  opts->wav_out_f = sf_open (opts->wav_out_file, SFM_RDWR, &info);
+
+  if (opts->wav_out_f == NULL)
+  {
+    fprintf (stderr,"Error - could not open wav output file %s\n", opts->wav_out_file);
+    return;
+  }
+}
+
+//generic rms type function
+long int gen_rms(short *samples, int len, int step)
+{
+  
+  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);
+  //make sure it doesnt' randomly feed us a large negative value (overflow?)
+  if (rms < 0) rms = 150; //could also consider returning 0 and making it return the last known good value instead
+  return rms;
+}
+
+//listening to and playing back analog audio
+void edacs_analog(dsd_opts * opts, dsd_state * state, int afs, unsigned char lcn)
+{
+
+  int i;
+  int count = 5; //RMS has a 5 count (5 * 180ms) now before cutting off;
+  short analog1[960];
+  short analog2[960];
+  short analog3[960];
+  short sample = 0; 
+
+  state->last_cc_sync_time = time(NULL);
+  state->last_vc_sync_time = time(NULL);
+
+  memset (analog1, 0, sizeof(analog1));
+  memset (analog2, 0, sizeof(analog2));
+  memset (analog3, 0, sizeof(analog3));
+
+  long int rms = opts->rtl_squelch_level + 1; //one more for the initial loop phase
+  long int sql = opts->rtl_squelch_level;
+
+  fprintf (stderr, "\n");
+
+  while (!exitflag && count > 0)
+  { 
+    //this will only work on 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 );
+        analog1[i] = sample;
+      }
+
+      for (i = 0; i < 960; i++)
+      {
+        pa_simple_read(opts->pulse_digi_dev_in, &sample, 2, NULL );
+        analog2[i] = sample;
+      }
+
+      for (i = 0; i < 960; i++)
+      {
+        pa_simple_read(opts->pulse_digi_dev_in, &sample, 2, NULL );
+        analog3[i] = sample;
+      }
+      //this rms will only work properly (for now) with squelch enabled in SDR++ or other
+      rms = gen_rms(analog3, 960, 1);
+    }
+
+    //TCP Input -- TODO: Error Handling if connection drops
+    if (opts->audio_in_type == 8)
+    {
+      for (i = 0; i < 960; i++)
+      {
+        sf_read_short(opts->tcp_file_in, &sample, 1);
+        analog1[i] = sample;
+      }
+
+      for (i = 0; i < 960; i++)
+      {
+        sf_read_short(opts->tcp_file_in, &sample, 1);
+        analog2[i] = sample;
+      }
+
+      for (i = 0; i < 960; i++)
+      {
+        sf_read_short(opts->tcp_file_in, &sample, 1);
+        analog3[i] = sample;
+      }
+      //this rms will only work properly (for now) with squelch enabled in SDR++
+      rms = gen_rms(analog3, 960, 1);
+    }
+
+    //RTL Input
+    #ifdef USE_RTLSDR
+    if (opts->audio_in_type == 3)
+    {
+      for (i = 0; i < 960; i++)
+      {
+        get_rtlsdr_sample(&sample, opts, state);
+        analog1[i] = sample;
+      }
+
+      for (i = 0; i < 960; i++)
+      {
+        get_rtlsdr_sample(&sample, opts, state);
+        analog2[i] = sample;
+      }
+
+      for (i = 0; i < 960; i++)
+      {
+        get_rtlsdr_sample(&sample, opts, state);
+        analog3[i] = sample;
+      }
+      //the rtl rms value works properly without needing a 'hard' squelch value
+      rms = rtl_return_rms();
+    }
+    #endif
+
+    //reconfigured to use seperate audio out stream that is always 48k short
+    if (opts->audio_out_type == 0 && opts->slot1_on == 1)
+    {
+      pa_simple_write(opts->pulse_raw_dev_out, analog1, 960*2, NULL);
+      pa_simple_write(opts->pulse_raw_dev_out, analog2, 960*2, NULL);
+      pa_simple_write(opts->pulse_raw_dev_out, analog3, 960*2, NULL);
+    }
+
+    if (opts->audio_out_type == 8) //UDP Audio
+    {
+      udp_socket_blaster (opts, state, 960*2, analog1);
+      udp_socket_blaster (opts, state, 960*2, analog2);
+      udp_socket_blaster (opts, state, 960*2, analog3);
+    }
+
+    //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, analog1, 960*2);
+      write (opts->audio_out_fd, analog2, 960*2);
+      write (opts->audio_out_fd, analog3, 960*2);
+    }
+
+    opts->rtl_rms = rms;
+
+
+    printFrameSync (opts, state, " EDACS", 0, "A");
+
+    if (rms < sql) count--;
+    else count = 5;
+
+    if (rms > sql) fprintf(stderr, "%s", KGRN);
+    else fprintf(stderr, "%s", KRED);
+
+    fprintf (stderr, " Analog RMS: %04ld SQL: %ld", rms, sql);
+    if (afs != 0)
+      fprintf (stderr, " AFS [%03d] [%02d-%03d] LCN [%02d]", afs, afs >> 7, afs & 0x7F, lcn);
+
+    //debug, view hit counter
+    // fprintf (stderr, " CNT: %d; ", count);
+
+    if (opts->floating_point == 1)
+      fprintf (stderr, "Analog Floating Point Output Not Supported");
+
+    //Update Ncurses Terminal
+    if (opts->use_ncurses_terminal == 1)
+      ncursesPrinter(opts, state);
+
+    //WIP: Write Analog Samples to wav file, easy enough, 
+    //but needs wav to be opened as 48k, or downsampled
+    //working on 48k version of openWavOutFile
+    if (opts->wav_out_f != NULL)
+    {
+      sf_write_short(opts->wav_out_f, analog1, 960);
+      sf_write_short(opts->wav_out_f, analog2, 960);
+      sf_write_short(opts->wav_out_f, analog3, 960);
+    }
+
+    //digitize analog samples for a dotting sequence check
+    unsigned long long int sr = 0;
+    for (i = 0; i < 960; i+=5) //Samples Per Symbol is 5, so incrememnt every 5
+    {
+      sr = sr << 1;
+      sr += digitize (opts, state, (int)analog1[i]);
+    }
+
+    //debug
+    // fprintf (stderr, " SR: %016llX", sr);
+
+    if (sr == 0xAAAAAAAAAAAAAAAA || sr == 0x5555555555555555)
+      count = 0; //break while loop, sr will not equal these if just random noise
+
+    fprintf (stderr, "%s", KNRM);
+
+    if (count > 0) fprintf (stderr, "\n");
+    
+  }
+}
+
+void edacs(dsd_opts * opts, dsd_state * state)
+{
+  //changed to ulli here for 32-bit cygwin (not sure if was an issue, but playing it safe)
+  unsigned long long int fr_1 = 0xFFFFFFFFFF; //40-bit frames
+  unsigned long long int fr_2 = 0; //each is a 40 bit frame that repeats 3 times
+  unsigned long long int fr_3 = 0; //two messages per frame
+  unsigned long long int fr_4 = 0xFFFFFFFFFF; 
+  unsigned long long int fr_5 = 0;
+  unsigned long long int fr_6 = 0;
+
+  //BCH stuff
+  unsigned long long int fr_1m = 0xFFFFFFF; //28-bit 7X message portion to pass to bch handler
+  unsigned long long int fr_1t = 0xFFFFFFFFFF; //40 bit return from BCH with poly attached
+  unsigned long long int fr_4m = 0xFFFFFFF; //28-bit 7X message portion to pass to bch handler
+  unsigned long long int fr_4t = 0xFFFFFFFFFF; //40 bit return from BCH with poly attached
+
+  unsigned char command = 0xFF;
+  unsigned char mt1 = 0x1F;
+  unsigned char mt2 = 0xF;
+  unsigned char lcn = 0;
+
+  //commands; may not use these anymore
+  unsigned int vcmd = 0xEE; //voice command variable
+  unsigned int idcmd = 0xFD;
+  unsigned int peercmd = 0xF88; //using for EA detection test
+  unsigned int netcmd = 0xF3; //using for Networked Test
+  UNUSED2(vcmd, idcmd);
+
+  state->edacs_vc_lcn = -1; //init on negative for ncurses and tuning
+
+  int i;
+  int edacs_bit[241] = {0}; //zero out bit array and collect bits into it.
+
+  for (i = 0; i < 240; i++) //288 bits every transmission minus 48 bit (24 dibit) sync pattern
+  {
+    edacs_bit[i] = getDibit (opts, state); //getDibit returns binary 0 or 1 on GFSK signal (Edacs and PV)
+  }
+
+  //push the edacs_bit array into fr format from EDACS-FM
+  for (i = 0; i < 40; i++)
+  {
+    //only fr_1 and fr4 are going to matter
+    fr_1 = fr_1 << 1;
+    fr_1 = fr_1 | edacs_bit[i]; 
+    fr_2 = fr_2 << 1;
+    fr_2 = fr_2 | edacs_bit[i+40];
+    fr_3 = fr_3 << 1;
+    fr_3 = fr_3 | edacs_bit[i+80];
+    
+    fr_4 = fr_4 << 1; 
+    fr_4 = fr_4 | edacs_bit[i+120]; 
+    fr_5 = fr_5 << 1;
+    fr_5 = fr_5 | edacs_bit[i+160];
+    fr_6 = fr_6 << 1;
+    fr_6 = fr_6 | edacs_bit[i+200]; 
+
+  }
+
+  fr_1 = fr_1 & 0xFFFFFFFFFF;
+  fr_4 = fr_4 & 0xFFFFFFFFFF;
+
+  fr_1m = (fr_1 & 0xFFFFFFF000) >> 12;
+  fr_4m = (fr_4 & 0xFFFFFFF000) >> 12;
+
+  //take our message and create a new crc for it, if it matches the old crc, then we have a good frame
+  fr_1t = edacs_bch (fr_1m);
+  fr_4t = edacs_bch (fr_4m);
+
+  fr_1t = fr_1t & 0xFFFFFFFFFF;
+  fr_4t = fr_4t & 0xFFFFFFFFFF;
+
+  if (fr_1 != fr_1t || fr_4 != fr_4t)
+  {
+    fprintf (stderr, " BCH FAIL ");
+  }
+  else //BCH Pass, continue from here.
+  {
+
+    //ESK on/off detection, I honestly don't remember the logic for this anymore, but it works fine
+    if ( (((fr_1t & 0xF000000000) >> 36) != 0xB)  && (((fr_1t & 0xF000000000) >> 36) != 0x1) && (((fr_1t & 0xFF00000000) >> 32) != 0xF3) )
+    {
+      //experimenting with values here, not too high, and not too low
+      if ( (((fr_1t & 0xF000000000) >> 36) <= 0x8 ))
+      { 
+        state->esk_mask = 0xA0;
+      }
+      //ideal value would be 5, but some other values exist that don't allow it
+      if ( (((fr_1t & 0xF000000000) >> 36) > 0x8 ) )
+      { 
+        state->esk_mask = 0x0;
+      }
+    }
+
+    //Standard/Networked Auto Detection
+    //if (command == netcmd) //netcmd is F3 Standard/Networked (I think)
+    if ( (fr_1t >> 32 == netcmd) || (fr_1t >> 32 == (netcmd ^ 0xA0)) ) 
+    { 
+      state->ea_mode = 0; //disable extended addressing mode
+    }
+
+    //EA Auto detection //peercmd is 0xF88 peer site relay 0xFF80000000 >> 28
+    if (fr_1t >> 28 == peercmd || fr_1t >> 28 == (peercmd ^ 0xA00) )
+    {
+      state->ea_mode = 1; //enable extended addressing mode
+    }
+
+    //Start Extended Addressing Mode 
+    if (state->ea_mode == 1)
+    {
+      command = ((fr_1t & 0xFF00000000) >> 32) ^ state->esk_mask;
+      mt1 = (command & 0xF8) >> 3;
+      mt2 = (fr_1t & 0x780000000) >> 31;
+      lcn = (fr_1t & 0x3E0000000) >> 29; //only valid during calls, status 
+
+      //Site ID
+      unsigned long long int site_id = 0; //we probably could just make this an int as well as the state variables
+      if (mt1 == 0x1F && mt2 == 0xA)
+      {
+        site_id = ((fr_1 & 0x1F000) >> 12) | ((fr_1 & 0x1F000000) >> 19);
+        fprintf (stderr, "%s", KYEL);
+        fprintf (stderr, " Site ID [%02llX][%03lld] Extended Addressing", site_id, site_id);
+        fprintf (stderr, "%s", KNRM);
+        state->edacs_site_id = site_id;
+      }
+      //Patch Groups
+      else if (mt1 == 0x1F && mt2 == 0xC)
+      {
+        int patch_site = ((fr_4t & 0xFF00000000) >> 32); //is site info valid, 0 for all sites? else patch only good on site listed?
+        int sourcep = ((fr_1t & 0xFFFF000) >> 12);
+        int targetp = ((fr_4t & 0xFFFF000) >> 12);
+        fprintf (stderr, " Patch -- Site [%d] Source [%d] Target [%d] ", patch_site, sourcep, targetp);
+      }
+      //Adjacent Sites
+      else if (mt1 == 0x1F && mt2 == 0x1)
+      {
+        fprintf (stderr, " Adjacent Site");
+        if ( ((fr_1t & 0xFF000) >> 12) > 0 )
+        {
+          int adj = (fr_1t & 0xFF000) >> 12;
+          int adj_l = (fr_1t & 0x1F000000) >> 24;
+          fprintf (stderr, " [%02X][%03d] on CC LCN [%02d]", adj, adj, adj_l);
+        }
+      }
+      //Control Channel LCN
+      else if (mt1 == 0x1F && mt2 == 0x8)
+      {
+        fprintf (stderr, " Control Channel LCN");
+        if (((fr_4t >> 12) & 0x1F) != 0)
+        {
+          state->edacs_cc_lcn = ((fr_4t >> 12) & 0x1F);
+          if (state->edacs_cc_lcn > state->edacs_lcn_count && lcn < 26) //26, or 27. shouldn't matter don't think cc lcn will give a status lcn val 
+          {
+            state->edacs_lcn_count = state->edacs_cc_lcn;
+          }
+          fprintf (stderr, " [%d]", state->edacs_cc_lcn);
+
+          //check for control channel lcn frequency if not provided in channel map or in the lcn list
+          if (state->trunk_lcn_freq[state->edacs_cc_lcn-1] == 0)
+          {
+            long int lcnfreq = 0;
+            //if using rigctl, we can ask for the currrent frequency
+            if (opts->use_rigctl == 1)
+            {
+              lcnfreq = GetCurrentFreq (opts->rigctl_sockfd);
+              if (lcnfreq != 0) state->trunk_lcn_freq[state->edacs_cc_lcn-1] = lcnfreq;
+            }
+            //if using rtl input, we can ask for the current frequency tuned
+            if (opts->audio_in_type == 3)
+            {
+              lcnfreq = (long int)opts->rtlsdr_center_freq;
+              if (lcnfreq != 0) state->trunk_lcn_freq[state->edacs_cc_lcn-1] = lcnfreq;
+            }
+          }
+
+          //set trunking cc here so we know where to come back to
+          if (opts->p25_trunk == 1 && state->trunk_lcn_freq[state->edacs_cc_lcn-1] != 0)
+          {
+            state->p25_cc_freq = state->trunk_lcn_freq[state->edacs_cc_lcn-1]; //index starts at zero, lcn's locally here start at 1
+          }
+        }
+      }
+      //disabling kick command, data looks like its just FFFF, no actual values, can't verify accuracy
+      // else if (mt1 == 0x1F && mt2 == 0xB) //KICK LISTING for EA?? Unverified, but probably observed in Unitrunker way back when.
+      // {
+      //   int kicked = (fr_4t & 0xFFFFF000) >> 12;
+      //   fprintf (stderr, " FR_1 [%010llX]", fr_1t);
+      //   fprintf (stderr, " FR_3 [%010llX]", fr_3);
+      //   fprintf (stderr, " FR_4 [%010llX]", fr_4t);
+      //   fprintf (stderr, " FR_6 [%010llX]", fr_6);
+      //   fprintf (stderr, " Kick Command?");
+      // }
+      //Voice Call Grant Update
+      // mt1 0x3 is Digital group voice call, 0x2 Group Data Channel, 0x1 TDMA call
+      else if (mt1 >= 0x1 && mt1 <= 0x3)
+      {
+        //LCNs greater than 26 are considered status values, "Busy, Queue, Deny, etc"
+        if (lcn > state->edacs_lcn_count && lcn < 26) 
+        {
+          state->edacs_lcn_count = lcn;
+        }
+
+        int group  = (fr_1t & 0xFFFF000) >> 12;
+        int source = (fr_4t & 0xFFFFF000) >> 12;
+        if (group != 0)  state->lasttg = group;
+        if (source != 0) state->lastsrc = source;
+        if (lcn != 0)    state->edacs_vc_lcn = lcn;
+        fprintf (stderr, "%s", KGRN);
+        fprintf (stderr, " Group [%05d] Source [%08d] LCN[%02d]", group, source, lcn);
+
+        char mode[8]; //allow, block, digital enc
+        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
+        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 EDACS EA -- 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");
+
+        if (mt1 == 0x1) fprintf (stderr, " TDMA Call"); //never observed, wonder if any EDACS systems ever carried a TDMA signal (X2-TDMA?)
+        if (mt1 == 0x2) fprintf (stderr, " Group Data Call"); //Never Seen this one before
+        if (mt1 == 0x3) fprintf (stderr, " Digital Call"); //ProVoice, this is what we always get on SLERS EA
+        fprintf (stderr, "%s", KNRM);
+
+        //this is working now with the new import setup
+        if (opts->p25_trunk == 1 && (strcmp(mode, "DE") != 0) && (strcmp(mode, "B") != 0) ) //DE is digital encrypted, B is block 
+        {
+          if (lcn < 26 && state->trunk_lcn_freq[lcn-1] != 0) //don't tune if zero (not loaded or otherwise)
+          {
+            //openwav file and do per call right here, should probably check as well to make sure we have a valid trunking method active (rigctl, rtl)
+            if (opts->dmr_stereo_wav == 1 && (opts->use_rigctl == 1 || opts->audio_in_type == 3))
+            {
+              sprintf (opts->wav_out_file, "./WAV/%s %s EDACS Site %lld TG %d SRC %d.wav", getDateE(), getTimeE(), state->edacs_site_id, group, source);
+              openWavOutFile (opts, state);
+              // openWavOutFile48k (opts, state); //debug for testing analog wav only
+            }
+            
+            //do condition here, in future, will allow us to use tuning methods as well, or rtl_udp as well
+            if (opts->use_rigctl == 1)
+            {
+              if (opts->setmod_bw != 0 ) SetModulation(opts->rigctl_sockfd, opts->setmod_bw); 
+      		    SetFreq(opts->rigctl_sockfd, state->trunk_lcn_freq[lcn-1]); //minus one because the lcn index starts at zero
+              state->edacs_tuned_lcn = lcn;
+              opts->p25_is_tuned = 1;
+              //debug testing (since I don't have EDACS standard w/ Analog nearby)
+              // edacs_analog(opts, state, group, lcn);
+            }
+
+            if (opts->audio_in_type == 3) //rtl dongle
+            {
+              #ifdef USE_RTLSDR
+              rtl_dev_tune (opts, state->trunk_lcn_freq[lcn-1]);
+              state->edacs_tuned_lcn = lcn;
+              opts->p25_is_tuned = 1;
+              //debug testing (since I don't have EDACS standard w/ Analog nearby)
+              // edacs_analog(opts, state, group, lcn);
+              #endif
+            }
+
+          }
+          
+        }
+      }
+      else //print frames for debug/analysis
+      {
+        fprintf (stderr, " FR_1 [%010llX]", fr_1t);
+        fprintf (stderr, " FR_4 [%010llX]", fr_4t);
+        fprintf (stderr, " Unknown Command");
+      }
+
+    }
+    //Start Standard or Networked Mode
+    else if (state->ea_mode == 0)
+    {
+      //standard or networked
+      command = ((fr_1t & 0xFF00000000) >> 32) ^ state->esk_mask;
+      lcn     = (fr_1t & 0xF8000000) >> 27;
+
+      //site ID and CC LCN
+      if (command == 0xFD)
+      {
+        int site_id = (fr_1t & 0xFF000) >> 12;
+        int cc_lcn = (fr_1t & 0x1F000000) >> 24;
+
+        fprintf (stderr, "%s", KYEL);
+        fprintf (stderr, " Site ID [%02X][%03d] on CC LCN [%02d] Standard/Networked", site_id, site_id, cc_lcn);
+        fprintf (stderr, "%s", KNRM);
+        state->edacs_site_id = site_id;
+        state->edacs_cc_lcn = cc_lcn;
+
+        if (state->edacs_cc_lcn > state->edacs_lcn_count && lcn < 26) 
+        {
+          state->edacs_lcn_count = state->edacs_cc_lcn;
+        }
+
+        //check for control channel lcn frequency if not provided in channel map or in the lcn list
+        if (state->trunk_lcn_freq[state->edacs_cc_lcn-1] == 0)
+        {
+          long int lcnfreq = 0;
+          //if using rigctl, we can ask for the currrent frequency
+          if (opts->use_rigctl == 1)
+          {
+            lcnfreq = GetCurrentFreq (opts->rigctl_sockfd);
+            if (lcnfreq != 0) state->trunk_lcn_freq[state->edacs_cc_lcn-1] = lcnfreq;
+          }
+          //if using rtl input, we can ask for the current frequency tuned
+          if (opts->audio_in_type == 3)
+          {
+            lcnfreq = (long int)opts->rtlsdr_center_freq;
+            if (lcnfreq != 0) state->trunk_lcn_freq[state->edacs_cc_lcn-1] = lcnfreq;
+          }
+        }
+
+        //set trunking cc here so we know where to come back to
+        if (opts->p25_trunk == 1 && state->trunk_lcn_freq[state->edacs_cc_lcn-1] != 0)
+        {
+          state->p25_cc_freq = state->trunk_lcn_freq[state->edacs_cc_lcn-1]; //index starts at zero, lcn's locally here start at 1
+        }
+
+      }
+
+      //voice call assignment
+      else if (command == 0xEE || command == 0xEF)
+      {
+
+        if (lcn > state->edacs_lcn_count && lcn < 26) 
+        {
+          state->edacs_lcn_count = lcn;
+        }
+        state->edacs_vc_lcn = lcn;
+        //just going to use the default 4-4-3 A-FS scheme, making it user configurable would be a pain
+        int afs = (fr_1t & 0x7FF000) >> 12;
+        int a = afs >> 7; 
+        int fs = afs & 0x7F;
+        int status  = (fr_1t & 0xF00000000) >> 32;
+        UNUSED(status);
+        if (afs > 0) state->lastsrc = afs; 
+        fprintf (stderr, "%s", KGRN);
+        fprintf (stderr, " AFS [%03d] [%02d-%03d] LCN [%02d]", afs, a, fs, lcn);
+
+        char mode[8]; //allow, block, digital enc
+        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
+        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 == afs)
+          {
+            fprintf (stderr, " [%s]", state->group_array[i].groupName);
+            strcpy (mode, state->group_array[i].groupMode);
+            break;
+          }
+        }
+
+        //TG hold on EDACS Standard/Net -- block non-matching target, allow matching afs (decimal)
+        if (state->tg_hold != 0 && state->tg_hold != afs) sprintf (mode, "%s", "B");
+        if (state->tg_hold != 0 && state->tg_hold == afs) sprintf (mode, "%s", "A");
+
+        //NOTE: Restructured below so that analog and digital are handled the same, just that when
+        //its analog, it will now start edacs_analog which will while loop analog samples until
+        //signal level drops (RMS, or a dotting sequence is detected)
+
+        //analog working now with edacs_analog
+        if (command == 0xEE)
+          fprintf (stderr, " Analog"); 
+
+        //Digital Call (ProVoice, hopefully, and not Aegis in 2022)
+        else
+          fprintf (stderr, " Digital");
+
+        //skip analog calls on RTL Input on ARM devices due to High CPU usage from RTL RMS function
+        // #ifdef __arm__
+        // if (command == 0xEE && opts->audio_in_type == 3)
+        //   goto ENDPV;
+        // #endif
+
+        //skip analog calls on UDP Audio Output
+        if (command == 0xEE && opts->audio_out_type == 8)
+          goto ENDPV;
+
+        //this is working now with the new import setup
+        if (opts->p25_trunk == 1 && (strcmp(mode, "DE") != 0) && (strcmp(mode, "B") != 0) ) //DE is digital encrypted, B is block
+        {
+          if (lcn < 26 && state->trunk_lcn_freq[lcn-1] != 0) //don't tune if zero (not loaded or otherwise)
+          {
+            //openwav file and do per call right here
+            if (opts->dmr_stereo_wav == 1 && (opts->use_rigctl == 1 || opts->audio_in_type == 3))
+            {
+              sprintf (opts->wav_out_file, "./WAV/%s %s EDACS Site %lld AFS %02d-%03d - %03d.wav", getDateE(), getTimeE(), state->edacs_site_id, a, fs, afs);
+              if (command == 0xEF) openWavOutFile (opts, state); //digital
+              if (command == 0xEE) openWavOutFile48k (opts, state); //analog at 48k
+            }
+
+            if (opts->use_rigctl == 1)
+            {
+              if (opts->setmod_bw != 0 ) SetModulation(opts->rigctl_sockfd, opts->setmod_bw); 
+              SetFreq(opts->rigctl_sockfd, state->trunk_lcn_freq[lcn-1]); //minus one because our index starts at zero
+              state->edacs_tuned_lcn = lcn;
+              opts->p25_is_tuned = 1;
+              if (command == 0xEE) edacs_analog(opts, state, afs, lcn);
+            }
+
+            if (opts->audio_in_type == 3) //rtl dongle
+            {
+              #ifdef USE_RTLSDR
+              rtl_dev_tune (opts, state->trunk_lcn_freq[lcn-1]);
+              state->edacs_tuned_lcn = lcn;
+              opts->p25_is_tuned = 1;
+              if (command == 0xEE) edacs_analog(opts, state, afs, lcn);
+              #endif
+            }
+          }
+        
+        }
+        fprintf (stderr, "%s", KNRM);
+      }
+      //Network Command, Not sure of how to handle, but just show frames
+      else if (command == 0xF3)
+      {
+        fprintf (stderr, " FR_1 [%010llX]", fr_1t);
+        fprintf (stderr, " FR_4 [%010llX]", fr_4t);
+        fprintf (stderr, " Network Command");
+      }
+
+      else //print frames for debug/analysis
+      {
+        fprintf (stderr, " FR_1 [%010llX]", fr_1t);
+        fprintf (stderr, " FR_4 [%010llX]", fr_4t);
+        fprintf (stderr, " Unknown Command");
+      }
+
+    } //end Standard or Networked
+
+    //supply user warning to use -9 switch if decoding doesn't start shortly
+    else fprintf (stderr, " Net/EA Auto Detect; Use -9 CLI Switch For Standard;");
+
+  }
+
+  ENDPV:
+
+  fprintf (stderr, "\n");
+
+}
+
+void eot_cc(dsd_opts * opts, dsd_state * state)
+{
+
+  fprintf (stderr, "EOT; \n");
+
+  //jump back to CC here
+  if (opts->p25_trunk == 1 && state->p25_cc_freq != 0 && opts->p25_is_tuned == 1)
+  {
+    
+    //rigctl
+    if (opts->use_rigctl == 1)
+    {
+      state->lasttg = 0;
+      state->lastsrc = 0;
+      state->payload_algid = 0; 
+      state->payload_keyid = 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->payload_algid = 0;
+      state->payload_keyid = 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
+    }
+
+  }
+}
+
+ 

src/ez.cpp

@@ -178,146 +178,167 @@ int ez_rs28_sacch (int payload[180], int parity[132])
   return (ec);
 }
 
-//I-ISCH Lookup section, borrowed from OP25
+//std::map <std::uint64_t, int> isch_map;
-std::map <std::string, int> isch_map;
+std::map <uint64_t, int> isch_map; //User Noted GCC potential compiler error fix on BB OP25
 void map_isch()
 {
-	isch_map["184229d461"] = 0;
+	isch_map[0x184229d461ULL] = 0;
-	isch_map["18761451f6"] = 1;
+	isch_map[0x18761451f6ULL] = 1;
-	isch_map["181ae27e2f"] = 2;
+	isch_map[0x181ae27e2fULL] = 2;
-	isch_map["182edffbb8"] = 3;
+	isch_map[0x182edffbb8ULL] = 3;
-	isch_map["18df8a7510"] = 4;
+	isch_map[0x18df8a7510ULL] = 4;
-	isch_map["18ebb7f087"] = 5;
+	isch_map[0x18ebb7f087ULL] = 5;
-	isch_map["188741df5e"] = 6;
+	isch_map[0x188741df5eULL] = 6;
-	isch_map["18b37c5ac9"] = 7;
+	isch_map[0x18b37c5ac9ULL] = 7;
-	isch_map["1146a44f13"] = 8;
+	isch_map[0x1146a44f13ULL] = 8;
-	isch_map["117299ca84"] = 9;
+	isch_map[0x117299ca84ULL] = 9;
-	isch_map["111e6fe55d"] = 10;
+	isch_map[0x111e6fe55dULL] = 10;
-	isch_map["112a5260ca"] = 11;
+	isch_map[0x112a5260caULL] = 11;
-	isch_map["11db07ee62"] = 12;
+	isch_map[0x11db07ee62ULL] = 12;
-	isch_map["11ef3a6bf5"] = 13;
+	isch_map[0x11ef3a6bf5ULL] = 13;
-	isch_map["1183cc442c"] = 14;
+	isch_map[0x1183cc442cULL] = 14;
-	isch_map["11b7f1c1bb"] = 15;
+	isch_map[0x11b7f1c1bbULL] = 15;
-	isch_map["1a4a2e239e"] = 16;
+	isch_map[0x1a4a2e239eULL] = 16;
-	isch_map["1a7e13a609"] = 17;
+	isch_map[0x1a7e13a609ULL] = 17;
-	isch_map["1a12e589d0"] = 18;
+	isch_map[0x1a12e589d0ULL] = 18;
-	isch_map["1a26d80c47"] = 19;
+	isch_map[0x1a26d80c47ULL] = 19;
-	isch_map["1ad78d82ef"] = 20;
+	isch_map[0x1ad78d82efULL] = 20;
-	isch_map["1ae3b00778"] = 21;
+	isch_map[0x1ae3b00778ULL] = 21;
-	isch_map["1a8f4628a1"] = 22;
+	isch_map[0x1a8f4628a1ULL] = 22;
-	isch_map["1abb7bad36"] = 23;
+	isch_map[0x1abb7bad36ULL] = 23;
-	isch_map["134ea3b8ec"] = 24;
+	isch_map[0x134ea3b8ecULL] = 24;
-	isch_map["137a9e3d7b"] = 25;
+	isch_map[0x137a9e3d7bULL] = 25;
-	isch_map["13166812a2"] = 26;
+	isch_map[0x13166812a2ULL] = 26;
-	isch_map["1322559735"] = 27;
+	isch_map[0x1322559735ULL] = 27;
-	isch_map["13d300199d"] = 28;
+	isch_map[0x13d300199dULL] = 28;
-	isch_map["13e73d9c0a"] = 29;
+	isch_map[0x13e73d9c0aULL] = 29;
-	isch_map["138bcbb3d3"] = 30;
+	isch_map[0x138bcbb3d3ULL] = 30;
-	isch_map["13bff63644"] = 31;
+	isch_map[0x13bff63644ULL] = 31;
-	isch_map["1442f705ef"] = 32;
+	isch_map[0x1442f705efULL] = 32;
-	isch_map["1476ca8078"] = 33;
+	isch_map[0x1476ca8078ULL] = 33;
-	isch_map["141a3cafa1"] = 34;
+	isch_map[0x141a3cafa1ULL] = 34;
-	isch_map["142e012a36"] = 35;
+	isch_map[0x142e012a36ULL] = 35;
-	isch_map["14df54a49e"] = 36;
+	isch_map[0x14df54a49eULL] = 36;
-	isch_map["14eb692109"] = 37;
+	isch_map[0x14eb692109ULL] = 37;
-	isch_map["14879f0ed0"] = 38;
+	isch_map[0x14879f0ed0ULL] = 38;
-	isch_map["14b3a28b47"] = 39;
+	isch_map[0x14b3a28b47ULL] = 39;
-	isch_map["1d467a9e9d"] = 40;
+	isch_map[0x1d467a9e9dULL] = 40;
-	isch_map["1d72471b0a"] = 41;
+	isch_map[0x1d72471b0aULL] = 41;
-	isch_map["1d1eb134d3"] = 42;
+	isch_map[0x1d1eb134d3ULL] = 42;
-	isch_map["1d2a8cb144"] = 43;
+	isch_map[0x1d2a8cb144ULL] = 43;
-	isch_map["1ddbd93fec"] = 44;
+	isch_map[0x1ddbd93fecULL] = 44;
-	isch_map["1defe4ba7b"] = 45;
+	isch_map[0x1defe4ba7bULL] = 45;
-	isch_map["1d831295a2"] = 46;
+	isch_map[0x1d831295a2ULL] = 46;
-	isch_map["1db72f1035"] = 47;
+	isch_map[0x1db72f1035ULL] = 47;
-	isch_map["164af0f210"] = 48;
+	isch_map[0x164af0f210ULL] = 48;
-	isch_map["167ecd7787"] = 49;
+	isch_map[0x167ecd7787ULL] = 49;
-	isch_map["16123b585e"] = 50;
+	isch_map[0x16123b585eULL] = 50;
-	isch_map["162606ddc9"] = 51;
+	isch_map[0x162606ddc9ULL] = 51;
-	isch_map["16d7535361"] = 52;
+	isch_map[0x16d7535361ULL] = 52;
-	isch_map["16e36ed6f6"] = 53;
+	isch_map[0x16e36ed6f6ULL] = 53;
-	isch_map["168f98f92f"] = 54;
+	isch_map[0x168f98f92fULL] = 54;
-	isch_map["16bba57cb8"] = 55;
+	isch_map[0x16bba57cb8ULL] = 55;
-	isch_map["1f4e7d6962"] = 56;
+	isch_map[0x1f4e7d6962ULL] = 56;
-	isch_map["1f7a40ecf5"] = 57;
+	isch_map[0x1f7a40ecf5ULL] = 57;
-	isch_map["1f16b6c32c"] = 58;
+	isch_map[0x1f16b6c32cULL] = 58;
-	isch_map["1f228b46bb"] = 59;
+	isch_map[0x1f228b46bbULL] = 59;
-	isch_map["1fd3dec813"] = 60;
+	isch_map[0x1fd3dec813ULL] = 60;
-	isch_map["1fe7e34d84"] = 61;
+	isch_map[0x1fe7e34d84ULL] = 61;
-	isch_map["1f8b15625d"] = 62;
+	isch_map[0x1f8b15625dULL] = 62;
-	isch_map["1fbf28e7ca"] = 63;
+	isch_map[0x1fbf28e7caULL] = 63;
-	isch_map["84d62c339"] = 64;
+	isch_map[0x084d62c339ULL] = 64;
-	isch_map["8795f46ae"] = 65;
+	isch_map[0x08795f46aeULL] = 65;
-	isch_map["815a96977"] = 66;
+	isch_map[0x0815a96977ULL] = 66;
-	isch_map["82194ece0"] = 67;
+	isch_map[0x082194ece0ULL] = 67;
-	isch_map["8d0c16248"] = 68;
+	isch_map[0x08d0c16248ULL] = 68;
-	isch_map["8e4fce7df"] = 69;
+	isch_map[0x08e4fce7dfULL] = 69;
-	isch_map["8880ac806"] = 70;
+	isch_map[0x08880ac806ULL] = 70;
-	isch_map["8bc374d91"] = 71;
+	isch_map[0x08bc374d91ULL] = 71;
-	isch_map["149ef584b"] = 72;
+	isch_map[0x0149ef584bULL] = 72;
-	isch_map["17dd2dddc"] = 73;
+	isch_map[0x017dd2dddcULL] = 73;
-	isch_map["11124f205"] = 74;
+	isch_map[0x011124f205ULL] = 74;
-	isch_map["125197792"] = 75;
+	isch_map[0x0125197792ULL] = 75;
-	isch_map["1d44cf93a"] = 76;
+	isch_map[0x01d44cf93aULL] = 76;
-	isch_map["1e0717cad"] = 77;
+	isch_map[0x01e0717cadULL] = 77;
-	isch_map["18c875374"] = 78;
+	isch_map[0x018c875374ULL] = 78;
-	isch_map["1b8bad6e3"] = 79;
+	isch_map[0x01b8bad6e3ULL] = 79;
-	isch_map["a456534c6"] = 80;
+	isch_map[0x0a456534c6ULL] = 80;
-	isch_map["a7158b151"] = 81;
+	isch_map[0x0a7158b151ULL] = 81;
-	isch_map["a1dae9e88"] = 82;
+	isch_map[0x0a1dae9e88ULL] = 82;
-	isch_map["a29931b1f"] = 83;
+	isch_map[0x0a29931b1fULL] = 83;
-	isch_map["ad8c695b7"] = 84;
+	isch_map[0x0ad8c695b7ULL] = 84;
-	isch_map["aecfb1020"] = 85;
+	isch_map[0x0aecfb1020ULL] = 85;
-	isch_map["a800d3ff9"] = 86;
+	isch_map[0x0a800d3ff9ULL] = 86;
-	isch_map["ab430ba6e"] = 87;
+	isch_map[0x0ab430ba6eULL] = 87;
-	isch_map["341e8afb4"] = 88;
+	isch_map[0x0341e8afb4ULL] = 88;
-	isch_map["375d52a23"] = 89;
+	isch_map[0x0375d52a23ULL] = 89;
-	isch_map["3192305fa"] = 90;
+	isch_map[0x03192305faULL] = 90;
-	isch_map["32d1e806d"] = 91;
+	isch_map[0x032d1e806dULL] = 91;
-	isch_map["3dc4b0ec5"] = 92;
+	isch_map[0x03dc4b0ec5ULL] = 92;
-	isch_map["3e8768b52"] = 93;
+	isch_map[0x03e8768b52ULL] = 93;
-	isch_map["38480a48b"] = 94;
+	isch_map[0x038480a48bULL] = 94;
-	isch_map["3b0bd211c"] = 95;
+	isch_map[0x03b0bd211cULL] = 95;
-	isch_map["44dbc12b7"] = 96;
+	isch_map[0x044dbc12b7ULL] = 96;
-	isch_map["479819720"] = 97;
+	isch_map[0x0479819720ULL] = 97;
-	isch_map["41577b8f9"] = 98;
+	isch_map[0x041577b8f9ULL] = 98;
-	isch_map["4214a3d6e"] = 99;
+	isch_map[0x04214a3d6eULL] = 99;
-	isch_map["4d01fb3c6"] = 100;
+	isch_map[0x04d01fb3c6ULL] = 100;
-	isch_map["4e4223651"] = 101;
+	isch_map[0x04e4223651ULL] = 101;
-	isch_map["488d41988"] = 102;
+	isch_map[0x0488d41988ULL] = 102;
-	isch_map["4bce99c1f"] = 103;
+	isch_map[0x04bce99c1fULL] = 103;
-	isch_map["d493189c5"] = 104;
+	isch_map[0x0d493189c5ULL] = 104;
-	isch_map["d7d0c0c52"] = 105;
+	isch_map[0x0d7d0c0c52ULL] = 105;
-	isch_map["d11fa238b"] = 106;
+	isch_map[0x0d11fa238bULL] = 106;
-	isch_map["d25c7a61c"] = 107;
+	isch_map[0x0d25c7a61cULL] = 107;
-	isch_map["dd49228b4"] = 108;
+	isch_map[0x0dd49228b4ULL] = 108;
-	isch_map["de0afad23"] = 109;
+	isch_map[0x0de0afad23ULL] = 109;
-	isch_map["d8c5982fa"] = 110;
+	isch_map[0x0d8c5982faULL] = 110;
-	isch_map["db864076d"] = 111;
+	isch_map[0x0db864076dULL] = 111;
-	isch_map["645bbe548"] = 112;
+	isch_map[0x0645bbe548ULL] = 112;
-	isch_map["6718660df"] = 113;
+	isch_map[0x06718660dfULL] = 113;
-	isch_map["61d704f06"] = 114;
+	isch_map[0x061d704f06ULL] = 114;
-	isch_map["6294dca91"] = 115;
+	isch_map[0x06294dca91ULL] = 115;
-	isch_map["6d8184439"] = 116;
+	isch_map[0x06d8184439ULL] = 116;
-	isch_map["6ec25c1ae"] = 117;
+	isch_map[0x06ec25c1aeULL] = 117;
-	isch_map["680d3ee77"] = 118;
+	isch_map[0x0680d3ee77ULL] = 118;
-	isch_map["6b4ee6be0"] = 119;
+	isch_map[0x06b4ee6be0ULL] = 119;
-	isch_map["f41367e3a"] = 120;
+	isch_map[0x0f41367e3aULL] = 120;
-	isch_map["f750bfbad"] = 121;
+	isch_map[0x0f750bfbadULL] = 121;
-	isch_map["f19fdd474"] = 122;
+	isch_map[0x0f19fdd474ULL] = 122;
-	isch_map["f2dc051e3"] = 123;
+	isch_map[0x0f2dc051e3ULL] = 123;
-	isch_map["fdc95df4b"] = 124;
+	isch_map[0x0fdc95df4bULL] = 124;
-	isch_map["fe8a85adc"] = 125;
+	isch_map[0x0fe8a85adcULL] = 125;
-	isch_map["f845e7505"] = 126;
+	isch_map[0x0f845e7505ULL] = 126;
-	isch_map["fb063f092"] = 127;
+	isch_map[0x0fb063f092ULL] = 127;
+	isch_map[0x575d57f7ffULL] =  -2; // S-ISCH
 }
 
-unsigned long long int isch_lookup (unsigned long long int isch)
+//I-ISCH Lookup, borrowed from OP25 (now w/ error correction)
+int isch_lookup (uint64_t isch)
 {
-  map_isch(); //initialize the lookup map
+	map_isch(); //initialize the lookup map
-  char s[64];
+	int decoded = -2;
-  unsigned long long int decoded = -2; //initialize lookup to an invalid number
+
-  sprintf(s, "%llx", isch);
+	// Must contain bit errors if no exact match, so
-  decoded = isch_map[s];
+	// look for codeword with smallest hamming distance
-  return(decoded);
+	if (isch_map.find(isch) == isch_map.end())
-}
+	{
+		int popct, popmin = 40;
+		for (auto it = isch_map.begin(); it != isch_map.end(); ++it)
+		{
+			popct = __builtin_popcountll(isch ^ it->first);
+			// Encoding is (40, 9, 16) which can correct at most 7 bit-errors
+			if ((popct <= 7) && (popct < popmin))
+			{
+					decoded = it->second;
+					popmin = popct;
+			}
+		}
+	return decoded;
+	}
+	else  // No errors, so simply return the matching value
+		decoded = isch_map[isch];
+		
+	return decoded;
+
+}

src/fec.c

@@ -760,6 +760,82 @@ 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()
 {
@@ -806,7 +882,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] = 12 + ip;
+                Golay_20_8_m_corr[syndromeIP][2] = 8 + ip;
             }
         }
 
@@ -824,14 +900,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] = 12 + ip1;
+            Golay_20_8_m_corr[syndromeIP1][1] = 8 + 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] = 12 + ip1;
+                Golay_20_8_m_corr[syndromeIP2][1] = 8 + ip1;
-                Golay_20_8_m_corr[syndromeIP2][2] = 12 + ip2;
+                Golay_20_8_m_corr[syndromeIP2][2] = 8 + ip2;
             }
         }
     }
@@ -840,23 +916,25 @@ 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] = 12 + ip1;
+        Golay_20_8_m_corr[syndromeIP1][0] = 8 + 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] = 12 + ip1;
+            Golay_20_8_m_corr[syndromeIP2][0] = 8 + ip1;
-            Golay_20_8_m_corr[syndromeIP2][1] = 12 + ip2;
+            Golay_20_8_m_corr[syndromeIP2][1] = 8 + 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] = 12 + ip1;
+                Golay_20_8_m_corr[syndromeIP3][0] = 8 + ip1;
-                Golay_20_8_m_corr[syndromeIP3][1] = 12 + ip2;
+                Golay_20_8_m_corr[syndromeIP3][1] = 8 + ip2;
-                Golay_20_8_m_corr[syndromeIP3][2] = 12 + ip3;
+                Golay_20_8_m_corr[syndromeIP3][2] = 8 + ip3;
             }
         }
     }
+
+    // rand_test_20_8(); //test
 }
 
 // Not very efficient but encode is used for unit testing only

src/m17.c

@@ -0,0 +1,797 @@
+/*-------------------------------------------------------------------------------
+ * m17.c
+ * M17 Decoder (WIP)
+ *
+ * m17_scramble Bit Array from SDR++
+ * CRC16 from M17-Implementations (thanks again, sp5wwp)
+ *
+ * LWVMOBILE
+ * 2023-07 DSD-FME Florida Man Edition
+ *-----------------------------------------------------------------------------*/
+#include "dsd.h"
+
+//try to find a fancy lfsr or calculation for this and not an array if possible
+uint8_t m17_scramble[369] = { 
+1, 1, 0, 1, 0, 1, 1, 0, 1, 0, 1, 1, 0, 1, 0, 1,
+1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0,
+1, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1,
+1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0,
+1, 0, 1, 1, 1, 0, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0,
+1, 0, 0, 1, 0, 1, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0,
+1, 1, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0,
+1, 1, 0, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1, 0, 1,
+0, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0,
+0, 1, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 1,
+1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, 0, 1,
+1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 0,
+0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 1,
+0, 0, 1, 1, 0, 1, 0, 1, 1, 1, 0, 1, 1, 0, 1, 0,
+0, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 1, 0, 1, 0,
+1, 1, 0, 0, 1, 1, 0, 1, 0, 1, 1, 1, 0, 1, 1, 0,
+0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 1,
+1, 1, 0, 1, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0,
+1, 1, 0, 1, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1,
+1, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 0, 0, 1, 1,
+0, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0,
+0, 0, 1, 0, 1, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1,
+0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 1, 1 
+};
+
+char b40[] = " ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-/.";
+
+uint8_t p1[62] = {
+1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1,
+1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1,
+1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1,
+1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1
+};
+
+//from M17_Implementations -- sp5wwp -- should have just looked here to begin with
+//this setup looks very similar to the OP25 variant of crc16, but with a few differences (uses packed bytes)
+uint16_t crc16m17(const uint8_t *in, const uint16_t len)
+{
+  uint32_t crc = 0xFFFF; //init val
+  uint16_t poly = 0x5935;
+  for(uint16_t i=0; i<len; i++)
+  {
+    crc^=in[i]<<8;
+    for(uint8_t j=0; j<8; j++)
+    {
+      crc<<=1;
+      if(crc&0x10000)
+        crc=(crc^poly)&0xFFFF;
+    }
+  }
+
+  return crc&(0xFFFF);
+}
+
+void M17decodeCSD(dsd_state * state, unsigned long long int dst, unsigned long long int src)
+{
+  //evaluate dst and src, and determine if they need to be converted to calsign
+  int i;
+  char c;
+
+  if (dst == 0xFFFFFFFFFFFF) 
+    fprintf (stderr, " DST: BROADCAST");
+  else if (dst == 0)
+    fprintf (stderr, " DST: RESERVED %012llx", dst);
+  else if (dst >= 0xEE6B28000000)
+    fprintf (stderr, " DST: RESERVED %012llx", dst);
+  else
+  {
+    fprintf (stderr, " DST: ");
+    for (i = 0; i < 9; i++)
+    {
+      c = b40[dst % 40];
+      state->m17_dst_csd[i] = c;
+      fprintf (stderr, "%c", c);
+      dst = dst / 40;
+    }
+    //assign completed CSD to a more useful string instead
+    sprintf (state->m17_dst_str, "%c%c%c%c%c%c%c%c%c", 
+    state->m17_dst_csd[0], state->m17_dst_csd[1], state->m17_dst_csd[2], state->m17_dst_csd[3], 
+    state->m17_dst_csd[4], state->m17_dst_csd[5], state->m17_dst_csd[6], state->m17_dst_csd[7], state->m17_dst_csd[8]);
+
+    //debug
+    // fprintf (stderr, "DT: %s", state->m17_dst_str);
+  }
+
+  if (src == 0xFFFFFFFFFFFF) 
+    fprintf (stderr, " SRC:  UNKNOWN FFFFFFFFFFFF");
+  else if (src == 0)
+    fprintf (stderr, " SRC: RESERVED %012llx", src);
+  else if (src >= 0xEE6B28000000)
+    fprintf (stderr, " SRC: RESERVED %012llx", src);
+  else
+  {
+    fprintf (stderr, " SRC: ");
+    for (i = 0; i < 9; i++)
+    {
+      c = b40[src % 40];
+      state->m17_src_csd[i] = c;
+      fprintf (stderr, "%c", c);
+      src = src / 40;
+    }
+    //assign completed CSD to a more useful string instead
+    sprintf (state->m17_src_str, "%c%c%c%c%c%c%c%c%c", 
+    state->m17_src_csd[0], state->m17_src_csd[1], state->m17_src_csd[2], state->m17_src_csd[3], 
+    state->m17_src_csd[4], state->m17_src_csd[5], state->m17_src_csd[6], state->m17_src_csd[7], state->m17_src_csd[8]);
+
+    //debug
+    // fprintf (stderr, "ST: %s", state->m17_src_str);
+  }
+
+  //debug
+  // fprintf (stderr, " DST: %012llX SRC: %012llX", state->m17_dst, state->m17_src);
+
+}
+
+void M17decodeLSF(dsd_state * state)
+{
+  int i;
+  
+  unsigned long long int lsf_dst = (unsigned long long int)ConvertBitIntoBytes(&state->m17_lsf[0], 48);
+  unsigned long long int lsf_src = (unsigned long long int)ConvertBitIntoBytes(&state->m17_lsf[48], 48);
+  uint16_t lsf_type = (uint16_t)ConvertBitIntoBytes(&state->m17_lsf[96], 16);
+
+  //this is the way the manual/code expects you to read these bits
+  // uint8_t lsf_ps = (lsf_type >> 0) & 0x1;
+  uint8_t lsf_dt = (lsf_type >> 1) & 0x3;
+  uint8_t lsf_et = (lsf_type >> 3) & 0x3;
+  uint8_t lsf_es = (lsf_type >> 5) & 0x3;
+  uint8_t lsf_cn = (lsf_type >> 7) & 0xF;
+  uint8_t lsf_rs = (lsf_type >> 11) & 0x1F;
+
+  //store this so we can reference it for playing voice and/or decoding data, dst/src etc
+  state->m17_str_dt = lsf_dt;
+  state->m17_dst = lsf_dst;
+  state->m17_src = lsf_src;
+  state->m17_can = lsf_cn;
+
+  fprintf (stderr, "\n");
+
+  //packet or stream
+  // if (lsf_ps == 0) fprintf (stderr, " P-");
+  // if (lsf_ps == 1) fprintf (stderr, " S-");
+
+  fprintf (stderr, " CAN: %d", lsf_cn);
+  M17decodeCSD(state, lsf_dst, lsf_src);
+  
+  if (lsf_dt == 0) fprintf (stderr, " Reserved");
+  if (lsf_dt == 1) fprintf (stderr, " Data");
+  if (lsf_dt == 2) fprintf (stderr, " Voice (3200bps)");
+  if (lsf_dt == 3) fprintf (stderr, " Voice + Data");
+
+  if (lsf_rs != 0) fprintf (stderr, " RS: %02X", lsf_rs);
+
+  if (lsf_et != 0) fprintf (stderr, " ENC:");
+  if (lsf_et == 2) fprintf (stderr, " AES-CTR");
+  if (lsf_et == 1) fprintf (stderr, " Scrambler - %d", lsf_es);
+
+  state->m17_enc = lsf_et;
+  state->m17_enc_st = lsf_es;
+
+  //pack meta bits into 14 bytes
+  for (i = 0; i < 14; i++)
+    state->m17_meta[i] = (uint8_t)ConvertBitIntoBytes(&state->m17_lsf[(i*8)+112], 8);
+
+  //Examine the Meta data
+  if (lsf_et == 0 && state->m17_meta[0] != 0) //not sure if this applies universally, or just to text data byte 0 for null data
+  {
+    fprintf (stderr,  " Meta:");
+    if (lsf_es == 0) fprintf (stderr, " Text Data");
+    if (lsf_es == 1) fprintf (stderr, " GNSS Pos");
+    if (lsf_es == 2) fprintf (stderr, " Extended CSD");
+    if (lsf_es == 3) fprintf (stderr, " Reserved");
+  }
+  
+  if (lsf_et == 2)
+  {
+    fprintf (stderr, " IV: ");
+    for (i = 0; i < 16; i++)
+      fprintf (stderr, "%02X", state->m17_meta[i]);
+  }
+  
+}
+
+int M17processLICH(dsd_state * state, dsd_opts * opts, uint8_t * lich_bits)
+{
+  int i, j, err;
+  err = 0;
+
+  uint8_t lich[4][24];
+  uint8_t lich_decoded[48];
+  uint8_t temp[96];
+  bool g[4];
+
+  uint8_t lich_counter = 0;
+  uint8_t lich_reserve = 0;
+
+  uint16_t crc_cmp = 0;
+  uint16_t crc_ext = 0;
+  uint8_t crc_err = 0;
+
+  memset(lich, 0, sizeof(lich));
+  memset(lich_decoded, 0, sizeof(lich_decoded));
+  memset(temp, 0, sizeof(temp));
+
+  //execute golay 24,12 or 4 24-bit chunks and reorder into 4 12-bit chunks
+  for (i = 0; i < 4; i++)
+  {
+    g[i] = TRUE;
+
+    for (j = 0; j < 24; j++)
+      lich[i][j] = lich_bits[(i*24)+j];
+
+    g[i] = Golay_24_12_decode(lich[i]);
+    if(g[i] == FALSE) err = -1;
+
+    for (j = 0; j < 12; j++)
+      lich_decoded[i*12+j] = lich[i][j];
+
+  }
+
+  lich_counter = (uint8_t)ConvertBitIntoBytes(&lich_decoded[40], 3); //lich_cnt
+  lich_reserve = (uint8_t)ConvertBitIntoBytes(&lich_decoded[43], 5); //lich_reserved
+
+  if (err == 0)
+    fprintf (stderr, "LC: %d/6 ", lich_counter+1);
+  else fprintf (stderr, "LICH G24 ERR");
+
+  if (err = 0 && lich_reserve != 0) fprintf(stderr, " LRS: %d", lich_reserve);
+
+  //transfer to storage
+  for (i = 0; i < 40; i++)
+    state->m17_lsf[lich_counter*40+i] = lich_decoded[i];
+
+  if (opts->payload == 1)
+  {
+    fprintf (stderr, " LICH: ");
+    for (i = 0; i < 6; i++)
+      fprintf (stderr, "[%02X]", (uint8_t)ConvertBitIntoBytes(&lich_decoded[i*8], 8)); 
+  }
+
+  uint8_t lsf_packed[30];
+  memset (lsf_packed, 0, sizeof(lsf_packed));
+
+  if (lich_counter == 5)
+  {
+
+    //need to pack bytes for the sw5wwp variant of the crc (might as well, may be useful in the future)
+    for (i = 0; i < 30; i++)
+      lsf_packed[i] = (uint8_t)ConvertBitIntoBytes(&state->m17_lsf[i*8], 8);
+
+    crc_cmp = crc16m17(lsf_packed, 28);
+    crc_ext = (uint16_t)ConvertBitIntoBytes(&state->m17_lsf[224], 16);
+
+    if (crc_cmp != crc_ext) crc_err = 1;
+
+    if (crc_err == 0)
+      M17decodeLSF(state);
+
+    if (opts->payload == 1)
+    {
+      fprintf (stderr, "\n LSF: ");
+      for (i = 0; i < 30; i++)
+      {
+        if (i == 15) fprintf (stderr, "\n      ");
+        fprintf (stderr, "[%02X]", lsf_packed[i]);
+      }
+    }
+
+    memset (state->m17_lsf, 1, sizeof(state->m17_lsf));
+
+    //debug
+    // fprintf (stderr, " E-%04X; C-%04X (CRC CHK)", crc_ext, crc_cmp);
+
+    if (crc_err == 1) fprintf (stderr, " EMB LSF CRC ERR");
+  }
+
+  return err;
+}
+
+void M17processCodec2_1600(dsd_opts * opts, dsd_state * state, uint8_t * payload)
+{
+
+  int i;
+  unsigned char voice1[8];
+  unsigned char voice2[8];
+
+  for (i = 0; i < 8; i++)
+  {
+    voice1[i] = (unsigned char)ConvertBitIntoBytes(&payload[i*8+0], 8);
+    voice2[i] = (unsigned char)ConvertBitIntoBytes(&payload[i*8+64], 8);
+  }
+
+  //TODO: Add some decryption methods
+  if (state->m17_enc != 0)
+  {
+    //process scrambler or AES-CTR decryption 
+    //(no AES-CTR right now, Scrambler should be easy enough)
+  }
+
+  if (opts->payload == 1)
+  {
+    fprintf (stderr, "\n CODEC2: ");
+    for (i = 0; i < 8; i++)
+      fprintf (stderr, "%02X", voice1[i]);
+    fprintf (stderr, " (1600)");
+
+    fprintf (stderr, "\n A_DATA: "); //arbitrary data
+    for (i = 0; i < 8; i++)
+      fprintf (stderr, "%02X", voice2[i]);
+  }
+  
+  #ifdef USE_CODEC2
+  size_t nsam;
+  nsam = 320;
+
+  //converted to using allocated memory pointers to prevent the overflow issues
+  short * samp1 = malloc (sizeof(short) * nsam);
+  short * upsamp = malloc (sizeof(short) * nsam * 6);
+  short * out = malloc (sizeof(short) * 6);
+  short prev;
+  int j;
+
+  codec2_decode(state->codec2_1600, samp1, voice1);
+
+  if (opts->audio_out_type == 0 && state->m17_enc == 0) //Pulse Audio
+  {
+    pa_simple_write(opts->pulse_digi_dev_out, samp1, nsam*2, NULL);
+  }
+
+  if (opts->audio_out_type == 0 && state->m17_enc == 0) //UDP Audio
+  {
+    udp_socket_blaster (opts, state, nsam*2, samp1);
+  }
+    
+  if (opts->audio_out_type == 5 && state->m17_enc == 0) //OSS 48k/1
+  {
+    //upsample to 48k and then play
+    prev = samp1[0];
+    for (i = 0; i < 160; i++)
+    {
+      upsampleS (samp1[i], prev, out);
+      for (j = 0; j < 6; j++) upsamp[(i*6)+j] = out[j];
+    }
+    write (opts->audio_out_fd, upsamp, nsam*2*6);
+
+  }
+
+  if (opts->audio_out_type == 1 && state->m17_enc == 0) //STDOUT
+  {
+    write (opts->audio_out_fd, samp1, nsam*2);
+  }
+
+  if (opts->audio_out_type == 2 && state->m17_enc == 0) //OSS 8k/1
+  {
+    write (opts->audio_out_fd, samp1, nsam*2);
+  }
+
+  //WIP: Wav file saving -- still need a way to open/close/label wav files similar to call history
+  if(opts->wav_out_f != NULL && state->m17_enc == 0) //WAV
+  {
+    sf_write_short(opts->wav_out_f, samp1, nsam);
+  }
+
+  //TODO: Codec2 Raw file saving
+  // if(mbe_out_dir)
+  // {
+
+  // }
+
+  free (samp1);
+  free (upsamp);
+  free (out);
+
+  #endif
+
+}
+
+void M17processCodec2_3200(dsd_opts * opts, dsd_state * state, uint8_t * payload)
+{
+  int i;
+  unsigned char voice1[8];
+  unsigned char voice2[8];
+
+  for (i = 0; i < 8; i++)
+  {
+    voice1[i] = (unsigned char)ConvertBitIntoBytes(&payload[i*8+0], 8);
+    voice2[i] = (unsigned char)ConvertBitIntoBytes(&payload[i*8+64], 8);
+  }
+
+  //TODO: Add some decryption methods
+  if (state->m17_enc != 0)
+  {
+    //process scrambler or AES-CTR decryption 
+    //(no AES-CTR right now, Scrambler should be easy enough)
+  }
+
+  if (opts->payload == 1)
+  {
+    fprintf (stderr, "\n CODEC2: ");
+    for (i = 0; i < 8; i++)
+      fprintf (stderr, "%02X", voice1[i]);
+    fprintf (stderr, " (3200)");
+
+    fprintf (stderr, "\n CODEC2: ");
+    for (i = 0; i < 8; i++)
+      fprintf (stderr, "%02X", voice2[i]);
+    fprintf (stderr, " (3200)");
+  }
+  
+  #ifdef USE_CODEC2
+  size_t nsam;
+  nsam = 160;
+
+  //converted to using allocated memory pointers to prevent the overflow issues
+  short * samp1 = malloc (sizeof(short) * nsam);
+  short * samp2 = malloc (sizeof(short) * nsam);
+  short * upsamp = malloc (sizeof(short) * nsam * 6);
+  short * out = malloc (sizeof(short) * 6);
+  short prev;
+  int j;
+
+  codec2_decode(state->codec2_3200, samp1, voice1);
+  codec2_decode(state->codec2_3200, samp2, voice2);
+
+  if (opts->audio_out_type == 0 && state->m17_enc == 0) //Pulse Audio
+  {
+    pa_simple_write(opts->pulse_digi_dev_out, samp1, nsam*2, NULL);
+    pa_simple_write(opts->pulse_digi_dev_out, samp2, nsam*2, NULL);
+  }
+
+  if (opts->audio_out_type == 0 && state->m17_enc == 0) //UDP Audio
+  {
+    udp_socket_blaster (opts, state, nsam*2, samp1);
+    udp_socket_blaster (opts, state, nsam*2, samp2);
+  }
+    
+  if (opts->audio_out_type == 5 && state->m17_enc == 0) //OSS 48k/1
+  {
+    //upsample to 48k and then play
+    prev = samp1[0];
+    for (i = 0; i < 160; i++)
+    {
+      upsampleS (samp1[i], prev, out);
+      for (j = 0; j < 6; j++) upsamp[(i*6)+j] = out[j];
+    }
+    write (opts->audio_out_fd, upsamp, nsam*2*6);
+    prev = samp2[0];
+    for (i = 0; i < 160; i++)
+    {
+      upsampleS (samp2[i], prev, out);
+      for (j = 0; j < 6; j++) upsamp[(i*6)+j] = out[j];
+    }
+    write (opts->audio_out_fd, upsamp, nsam*2*6);
+  }
+
+  if (opts->audio_out_type == 1 && state->m17_enc == 0) //STDOUT
+  {
+    write (opts->audio_out_fd, samp1, nsam*2);
+    write (opts->audio_out_fd, samp2, nsam*2);
+  }
+
+  if (opts->audio_out_type == 2 && state->m17_enc == 0) //OSS 8k/1 
+  {
+    write (opts->audio_out_fd, samp1, nsam*2);
+    write (opts->audio_out_fd, samp2, nsam*2);
+  }
+
+  //WIP: Wav file saving -- still need a way to open/close/label wav files similar to call history
+  if(opts->wav_out_f != NULL && state->m17_enc == 0) //WAV
+  {
+    sf_write_short(opts->wav_out_f, samp1, nsam);
+    sf_write_short(opts->wav_out_f, samp2, nsam);
+  }
+
+  //TODO: Codec2 Raw file saving
+  // if(mbe_out_dir)
+  // {
+
+  // }
+
+  free (samp1);
+  free (samp2);
+  free (upsamp);
+  free (out);
+
+  #endif
+
+}
+
+void M17prepareStream(dsd_opts * opts, dsd_state * state, uint8_t * m17_bits)
+{
+
+  int i, k, x; 
+  uint8_t m17_punc[275]; //25 * 11 = 275
+  memset (m17_punc, 0, sizeof(m17_punc));
+  for (i = 0; i < 272; i++)
+    m17_punc[i] = m17_bits[i+96];
+
+  //depuncture the bits
+  uint8_t m17_depunc[300]; //25 * 12 = 300
+  memset (m17_depunc, 0, sizeof(m17_depunc));
+  k = 0; x = 0;
+  for (i = 0; i < 25; i++)
+  {
+    m17_depunc[k++] = m17_punc[x++];
+    m17_depunc[k++] = m17_punc[x++];
+    m17_depunc[k++] = m17_punc[x++];
+    m17_depunc[k++] = m17_punc[x++];
+    m17_depunc[k++] = m17_punc[x++];
+    m17_depunc[k++] = m17_punc[x++];
+    m17_depunc[k++] = m17_punc[x++];
+    m17_depunc[k++] = m17_punc[x++];
+    m17_depunc[k++] = m17_punc[x++];
+    m17_depunc[k++] = m17_punc[x++];
+    m17_depunc[k++] = m17_punc[x++];
+    m17_depunc[k++] = 0; 
+  }
+
+  //setup the convolutional decoder
+  uint8_t temp[300];
+  uint8_t s0;
+  uint8_t s1;
+  uint8_t m_data[28];
+  uint8_t trellis_buf[144];
+  memset (trellis_buf, 0, sizeof(trellis_buf));
+  memset (temp, 0, sizeof (temp));
+  memset (m_data, 0, sizeof (m_data));
+
+  for (i = 0; i < 296; i++)
+    temp[i] = m17_depunc[i] << 1; 
+
+  CNXDNConvolution_start();
+  for (i = 0; i < 148; i++)
+  {
+    s0 = temp[(2*i)];
+    s1 = temp[(2*i)+1];
+
+    CNXDNConvolution_decode(s0, s1);
+  }
+
+  CNXDNConvolution_chainback(m_data, 144);
+
+  //144/8 = 18, last 4 (144-148) are trailing zeroes
+  for(i = 0; i < 18; i++)
+  {
+    trellis_buf[(i*8)+0] = (m_data[i] >> 7) & 1;
+    trellis_buf[(i*8)+1] = (m_data[i] >> 6) & 1;
+    trellis_buf[(i*8)+2] = (m_data[i] >> 5) & 1;
+    trellis_buf[(i*8)+3] = (m_data[i] >> 4) & 1;
+    trellis_buf[(i*8)+4] = (m_data[i] >> 3) & 1;
+    trellis_buf[(i*8)+5] = (m_data[i] >> 2) & 1;
+    trellis_buf[(i*8)+6] = (m_data[i] >> 1) & 1;
+    trellis_buf[(i*8)+7] = (m_data[i] >> 0) & 1;
+  }
+
+  //load m_data into bits for either data packets or voice packets
+  uint8_t payload[128];
+  uint8_t end = 9;
+  uint16_t fn = 0;
+  memset (payload, 0, sizeof(payload));
+
+  end = trellis_buf[0];
+  fn = (uint16_t)ConvertBitIntoBytes(&trellis_buf[1], 15);
+
+  //insert fn bits into meta 14 and meta 15 for Initialization Vector
+  state->m17_meta[14] = (uint8_t)ConvertBitIntoBytes(&trellis_buf[1], 7);
+  state->m17_meta[15] = (uint8_t)ConvertBitIntoBytes(&trellis_buf[8], 8);
+
+  if (opts->payload == 1)
+    fprintf (stderr, " FSN: %05d", fn);
+
+  if (end == 1)
+    fprintf (stderr, " END;");
+
+  for (i = 0; i < 128; i++)
+    payload[i] = trellis_buf[i+16];
+
+  if (state->m17_str_dt == 2)
+    M17processCodec2_3200(opts, state, payload);
+  else if (state->m17_str_dt == 3)
+    M17processCodec2_1600(opts, state, payload);
+  else if (state->m17_str_dt == 1) fprintf (stderr, " DATA;");
+  else if (state->m17_str_dt == 0) fprintf (stderr, "  RES;");
+  // else                             fprintf (stderr, "  UNK;");
+
+  if (opts->payload == 1 && state->m17_str_dt < 2)
+  {
+    fprintf (stderr, "\n STREAM: ");
+    for (i = 0; i < 18; i++) 
+      fprintf (stderr, "[%02X]", (uint8_t)ConvertBitIntoBytes(&trellis_buf[i*8], 8));
+  }
+
+}
+
+void processM17STR(dsd_opts * opts, dsd_state * state)
+{
+
+  int i, x;
+  //overflow/memory issue returns in Cygwin for...reasons...
+  uint8_t dbuf[384]; //384-bit frame - 16-bit (8 symbol) sync pattern (184 dibits)
+  uint8_t m17_rnd_bits[368]; //368 bits that are still scrambled (randomized)
+  uint8_t m17_int_bits[368]; //368 bits that are still interleaved
+  uint8_t m17_bits[368]; //368 bits that have been de-interleaved and de-scramble
+  uint8_t lich_bits[96];
+  int lich_err = -1;
+
+  memset (dbuf, 0, sizeof(dbuf));
+  memset (m17_rnd_bits, 0, sizeof(m17_rnd_bits));
+  memset (m17_int_bits, 0, sizeof(m17_int_bits));
+  memset (m17_bits, 0, sizeof(m17_bits));
+  memset (lich_bits, 0, sizeof(lich_bits));
+
+  //load dibits into dibit buffer
+  for (i = 0; i < 184; i++)
+    dbuf[i] = (uint8_t) getDibit(opts, state);
+
+  //convert dbuf into a bit array
+  for (i = 0; i < 184; i++)
+  {
+    m17_rnd_bits[i*2+0] = (dbuf[i] >> 1) & 1;
+    m17_rnd_bits[i*2+1] = (dbuf[i] >> 0) & 1;
+  }
+
+  //descramble the frame
+  for (i = 0; i < 368; i++)
+    m17_int_bits[i] = (m17_rnd_bits[i] ^ m17_scramble[i]) & 1;
+
+  //deinterleave the bit array using Quadratic Permutation Polynomial
+  //function π(x) = (45x + 92x^2 ) mod 368
+  for (i = 0; i < 368; i++)
+  {
+    x = ((45*i)+(92*i*i)) % 368;
+    m17_bits[i] = m17_int_bits[x];
+  }
+
+  for (i = 0; i < 96; i++)
+    lich_bits[i] = m17_bits[i];
+
+  //check lich first, and handle LSF chunk and completed LSF
+  lich_err = M17processLICH(state, opts, lich_bits);
+
+  if (lich_err == 0)
+    M17prepareStream(opts, state, m17_bits);
+
+  // if (lich_err != 0) state->lastsynctype = -1; //disable
+
+  //ending linebreak
+  fprintf (stderr, "\n");
+
+} //end processM17STR
+
+void processM17LSF(dsd_opts * opts, dsd_state * state)
+{
+
+  //NOTE: Have not been able to get this to work successfully, but considering
+  //there is only one LSF frame at the beginning of TX, its probably just as easy to
+  //use and rely on the STR frame and embedded LSF chunk, which does work properly
+  int i, j, k, x;
+  uint8_t dbuf[184]; //384-bit frame - 16-bit (8 symbol) sync pattern (184 dibits)
+  uint8_t m17_rnd_bits[368]; //368 bits that are still scrambled (randomized)
+  uint8_t m17_int_bits[368]; //368 bits that are still interleaved
+  uint8_t m17_bits[368]; //368 bits that have been de-interleaved and de-scramble
+  uint8_t m17_depunc[488]; //488 bits after depuncturing
+
+  memset (dbuf, 0, sizeof(dbuf));
+  memset (m17_rnd_bits, 0, sizeof(m17_rnd_bits));
+  memset (m17_int_bits, 0, sizeof(m17_int_bits));
+  memset (m17_bits, 0, sizeof(m17_bits));
+  memset (m17_depunc, 0, sizeof(m17_depunc));
+
+  //load dibits into dibit buffer
+  for (i = 0; i < 184; i++)
+    dbuf[i] = (uint8_t) getDibit(opts, state);
+
+  //convert dbuf into a bit array
+  for (i = 0; i < 184; i++)
+  {
+    m17_rnd_bits[i*2+0] = (dbuf[i] >> 1) & 1;
+    m17_rnd_bits[i*2+1] = (dbuf[i] >> 0) & 1;
+  }
+
+  //descramble the frame
+  for (i = 0; i < 368; i++)
+    m17_int_bits[i] = (m17_rnd_bits[i] ^ m17_scramble[i]) & 1;
+
+  //deinterleave the bit array using Quadratic Permutation Polynomial
+  //function π(x) = (45x + 92x^2 ) mod 368
+  for (i = 0; i < 368; i++)
+  {
+    x = ((45*i)+(92*i*i)) % 368;
+    m17_bits[i] = m17_int_bits[x];
+  }
+
+  j = 0; k = 0; x = 0;
+
+  // P1 Depuncture
+  for (i = 0; i < 488; i++)
+  {
+    if (p1[k++] == 1) m17_depunc[x++] = m17_bits[j++];
+    else m17_depunc[x++] = 0;
+
+    if (k == 61) k = 0; //61 -- should reset 8 times againt the array
+
+  }
+
+  //debug -- values seem okay at end of run
+  // fprintf (stderr, "K = %d; J = %d; X = %d", k, j, x);
+
+  //setup the convolutional decoder
+  uint8_t temp[488];
+  uint8_t s0;
+  uint8_t s1;
+  uint8_t m_data[30];
+  uint8_t trellis_buf[240]; //30*8 = 240
+  memset (trellis_buf, 0, sizeof(trellis_buf));
+  memset (temp, 0, sizeof (temp));
+  memset (m_data, 0, sizeof (m_data));
+
+  for (i = 0; i < 488; i++)
+    temp[i] = m17_depunc[i] << 1; 
+
+  CNXDNConvolution_start();
+  for (i = 0; i < 244; i++)
+  {
+    s0 = temp[(2*i)];
+    s1 = temp[(2*i)+1];
+
+    CNXDNConvolution_decode(s0, s1);
+  }
+
+  CNXDNConvolution_chainback(m_data, 240);
+
+  //244/8 = 30, last 4 (244-248) are trailing zeroes
+  for(i = 0; i < 30; i++)
+  {
+    trellis_buf[(i*8)+0] = (m_data[i] >> 7) & 1;
+    trellis_buf[(i*8)+1] = (m_data[i] >> 6) & 1;
+    trellis_buf[(i*8)+2] = (m_data[i] >> 5) & 1;
+    trellis_buf[(i*8)+3] = (m_data[i] >> 4) & 1;
+    trellis_buf[(i*8)+4] = (m_data[i] >> 3) & 1;
+    trellis_buf[(i*8)+5] = (m_data[i] >> 2) & 1;
+    trellis_buf[(i*8)+6] = (m_data[i] >> 1) & 1;
+    trellis_buf[(i*8)+7] = (m_data[i] >> 0) & 1;
+  }
+
+  memset (state->m17_lsf, 0, sizeof(state->m17_lsf));
+  memcpy (state->m17_lsf, trellis_buf, 240);
+
+  uint8_t lsf_packed[30];
+  memset (lsf_packed, 0, sizeof(lsf_packed));
+
+  //need to pack bytes for the sw5wwp variant of the crc (might as well, may be useful in the future)
+  for (i = 0; i < 30; i++)
+    lsf_packed[i] = (uint8_t)ConvertBitIntoBytes(&state->m17_lsf[i*8], 8);
+
+  uint16_t crc_cmp = crc16m17(lsf_packed, 28);
+  uint16_t crc_ext = (uint16_t)ConvertBitIntoBytes(&state->m17_lsf[224], 16);
+  int crc_err = 0;
+
+  if (crc_cmp != crc_ext) crc_err = 1;
+
+  if (crc_err == 0)
+    M17decodeLSF(state);
+
+  if (opts->payload == 1)
+  {
+    fprintf (stderr, "\n LSF: ");
+    for (i = 0; i < 30; i++)
+    {
+      if (i == 15) fprintf (stderr, "\n      ");
+      fprintf (stderr, "[%02X]", lsf_packed[i]);
+    }
+  }
+
+  //debug
+  // fprintf (stderr, " E-%04X; C-%04X (CRC CHK)", crc_ext, crc_cmp);
+
+  if (crc_err == 1) fprintf (stderr, " CRC ERR");
+
+  //ending linebreak
+  fprintf (stderr, "\n");
+
+} //end processM17LSF

src/nxdn96.c

@@ -1,124 +0,0 @@
-#include "dsd.h"
-#include "nxdn96_const.h"
-
-void
-processNXDN96 (dsd_opts * opts, dsd_state * state)
-{
-  int i, j, k, dibit;
-
-  char ambe_fr[4][24];
-  const int *w, *x, *y, *z;
-
-  if (opts->errorbars == 1)
-    {
-      fprintf (stderr, "VOICE e:");
-    }
-
-#ifdef NXDN_DUMP
-  fprintf (stderr, "\n");
-#endif
-
-  for (k = 0; k < 4; k++)
-    {
-      for (i = 0; i < 222; i++)
-        {
-          dibit = getDibit (opts, state);
-#ifdef NXDN_DUMP
-          fprintf (stderr, "%c", dibit + 48);
-#endif
-        }
-#ifdef NXDN_DUMP
-      fprintf (stderr, " ");
-#endif
-
-      if (k < 3)
-        {
-          for (j = 0; j < 4; j++)
-            {
-              w = nW;
-              x = nX;
-              y = nY;
-              z = nZ;
-              for (i = 0; i < 36; i++)
-                {
-                  dibit = getDibit (opts, state);
-#ifdef NXDN_DUMP
-                  fprintf (stderr, "%c", dibit + 48);
-#endif
-                  ambe_fr[*w][*x] = (1 & (dibit >> 1)); // bit 1
-                  ambe_fr[*y][*z] = (1 & dibit);        // bit 0
-                  w++;
-                  x++;
-                  y++;
-                  z++;
-                }
-              processMbeFrame (opts, state, NULL, ambe_fr, NULL);
-#ifdef NXDN_DUMP
-              fprintf (stderr, " ");
-#endif
-            }
-        }
-      else
-        {
-          for (j = 0; j < 3; j++)       // we skip the last voice frame until frame sync can work with < 24 symbols
-            {
-              w = nW;
-              x = nX;
-              y = nY;
-              z = nZ;
-              for (i = 0; i < 36; i++)
-                {
-                  dibit = getDibit (opts, state);
-#ifdef NXDN_DUMP
-                  fprintf (stderr, "%c", dibit + 48);
-#endif
-                  ambe_fr[*w][*x] = (1 & (dibit >> 1)); // bit 1
-                  ambe_fr[*y][*z] = (1 & dibit);        // bit 0
-                  w++;
-                  x++;
-                  y++;
-                  z++;
-                }
-              processMbeFrame (opts, state, NULL, ambe_fr, NULL);
-#ifdef NXDN_DUMP
-              fprintf (stderr, " ");
-#endif
-            }
-        }
-
-      if (k < 3)
-        {
-          for (i = 0; i < 18; i++)
-            {
-              dibit = getDibit (opts, state);
-#ifdef NXDN_DUMP
-              fprintf (stderr, "%c", dibit + 48);
-#endif
-            }
-#ifdef NXDN_DUMP
-          fprintf (stderr, " ");
-#endif
-
-        }
-      else
-        {
-          for (i = 0; i < 30; i++)
-            {
-              dibit = getDibit (opts, state);
-#ifdef NXDN_DUMP
-              fprintf (stderr, "%c", dibit + 48);
-#endif
-            }
-        }
-    }
-
-#ifdef NXDN_DUMP
-  fprintf (stderr, "\n");
-#endif
-
-  if (opts->errorbars == 1)
-    {
-      printf ("\n");
-    }
-
-}

src/nxdn_convolution.c

@@ -24,10 +24,8 @@
 
 
 /* Include ------------------------------------------------------------------*/
-//#include "nxdnconvolution.h"
 
 #include <stdio.h>
-//#include <assert.h>
 #include <string.h>
 #include <stdlib.h>
 #include <math.h>
@@ -38,40 +36,28 @@
 
 
 /* Global variables ---------------------------------------------------------*/
-static const uint8_t CNXDNConvolution_BIT_MASK_TABLE[] = {0x80U, 0x40U, 0x20U, 0x10U, 0x08U, 0x04U, 0x02U, 0x01U};
+static const uint8_t CNXDNConvolution_BIT_MASK_TABLE[8] = {0x80U, 0x40U, 0x20U, 0x10U, 0x08U, 0x04U, 0x02U, 0x01U};
 
 #define WRITE_BIT1(p,i,b) p[(i)>>3] = (b) ? (p[(i)>>3] | CNXDNConvolution_BIT_MASK_TABLE[(i)&7]) : (p[(i)>>3] & ~CNXDNConvolution_BIT_MASK_TABLE[(i)&7])
 #define READ_BIT1(p,i)    (p[(i)>>3] & CNXDNConvolution_BIT_MASK_TABLE[(i)&7])
 
-static const uint8_t CNXDNConvolution_BRANCH_TABLE1[] = {0U, 0U, 0U, 0U, 2U, 2U, 2U, 2U};
+static const uint8_t CNXDNConvolution_BRANCH_TABLE1[8] = {0U, 0U, 0U, 0U, 2U, 2U, 2U, 2U};
-static const uint8_t CNXDNConvolution_BRANCH_TABLE2[] = {0U, 2U, 2U, 0U, 0U, 2U, 2U, 0U};
+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;
 
-static uint16_t   m_metrics1[16U] = {0};
+//NOTE:
-static uint16_t   m_metrics2[16U] = {0};
+uint16_t   m_metrics1[16];
-static uint64_t   m_decisions[300U] = {0};
+uint16_t   m_metrics2[16];
-static uint16_t * m_oldMetrics = NULL;
+uint64_t   m_decisions[8*300];
-static uint16_t * m_newMetrics = NULL;
+uint16_t * m_oldMetrics = NULL;
-static uint64_t * m_dp = NULL;
+uint16_t * m_newMetrics = NULL;
-
+uint64_t * m_dp = NULL;
 
 /* Functions ----------------------------------------------------------------*/
 
-void CNXDNConvolution_start(void)
-{
-  memset(m_metrics1, 0x00U, CNXDNConvolution_NUM_OF_STATES * sizeof(uint16_t));
-  memset(m_metrics2, 0x00U, CNXDNConvolution_NUM_OF_STATES * sizeof(uint16_t));
-
-  m_oldMetrics = m_metrics1;
-  m_newMetrics = m_metrics2;
-  m_dp = m_decisions;
-}
-
-
 void CNXDNConvolution_decode(uint8_t s0, uint8_t s1)
 {
   uint8_t    i = 0;
@@ -169,3 +155,19 @@ void CNXDNConvolution_encode(const unsigned char* in, unsigned char* out, unsign
   }
 }
 
+void CNXDNConvolution_start(void)
+{
+
+  m_oldMetrics = m_metrics1;
+  m_newMetrics = m_metrics2;
+  m_dp = m_decisions;
+
+}
+
+void CNXDNConvolution_init()
+{
+  memset(m_metrics1, 0xFF, 16*sizeof(uint16_t));
+  memset(m_metrics2, 0xFF, 16*sizeof(uint16_t));
+  // memset(m_decisions,0xFF, 8*300*sizeof(uint64_t));
+}
+

src/nxdn_data.c

@@ -1,127 +0,0 @@
-#include "dsd.h"
-#include "nxdn_const.h"
-
-void processNXDNData (dsd_opts * opts, dsd_state * state)
-{
-  int i, dibit = 0;
-  unsigned char sacch_raw[72] = {0};
-  unsigned char sacch_decoded[32] = {0}; /* 26 bit + 6 bit CRC */
-  unsigned char *pr;
-  uint8_t CrcIsGood = 0;
-  uint8_t StructureField = 0;
-  uint8_t RAN = 0;
-  uint8_t PartOfFrame = 0;
-
-  /* Remove compiler warning */
-  //UNUSED_VARIABLE(dibit);
-
-  //if using NXDN Scrambling, run LFSRN (dummy ambe values) to continue seed
-  if (state->nxdn_cipher_type == 0x1 && state->R != 0)
-  {
-    char ambe_temp[49] = {0};
-    char ambe_d[49] = {0};
-    for (i = 0; i < 4; i++)
-    {
-      LFSRN(ambe_temp, ambe_d, state);
-    }
-  }
-
-  if (opts->errorbars == 1)
-  {
-    fprintf(stderr, "DATA  - ");
-  }
-
-  /* Start pseudo-random NXDN sequence after
-   * LICH = 16 bit = 8 dibit
-   * ==> Index 8 */
-  pr = (unsigned char *)(&nxdnpr2[8]);
-  for (i = 0; i < 30; i++)
-  {
-    dibit = getDibit (opts, state);
-
-    /* Store and de-interleave directly SACCH bits */
-    sacch_raw[(2*i)]   = ((*pr) & 1) ^ (1 & (dibit >> 1));  // bit 1
-    sacch_raw[(2*i)+1] = (1 & dibit);               // bit 0
-    pr++;
-#ifdef NXDN_DUMP
-    fprintf(stderr, "%c", dibit + 48);
-#endif
-  }
-#ifdef NXDN_DUMP
-  fprintf(stderr, " ");
-#endif
-
-
-  /* Decode the SACCH fields */
-  CrcIsGood = NXDN_SACCH_raw_part_decode(sacch_raw, sacch_decoded);
-  StructureField = (sacch_decoded[0]<<1 | sacch_decoded[1]<<0) & 0x03; /* Compute the Structure Field (remove 2 first bits of the SR Information in the SACCH) */
-  RAN = (sacch_decoded[2]<<5 | sacch_decoded[3]<<4 | sacch_decoded[4]<<3 | sacch_decoded[5]<<2 | sacch_decoded[6]<<1 | sacch_decoded[7]<<0) & 0x3F; /* Compute the RAN (6 last bits of the SR Information in the SACCH) */
-
-  /* Compute the Part of Frame according to the structure field */
-  if     (StructureField == 3) PartOfFrame = 0;
-  else if(StructureField == 2) PartOfFrame = 1;
-  else if(StructureField == 1) PartOfFrame = 2;
-  else if(StructureField == 0) PartOfFrame = 3;
-  else PartOfFrame = 0; /* Normally we should never go here */
-
-  /* Fill the SACCH structure */
-  state->NxdnSacchRawPart[PartOfFrame].CrcIsGood = CrcIsGood;
-  state->NxdnSacchRawPart[PartOfFrame].StructureField = StructureField;
-  state->NxdnSacchRawPart[PartOfFrame].RAN = RAN;
-
-  memcpy(state->NxdnSacchRawPart[PartOfFrame].Data, &sacch_decoded[8], 18); /* Copy the 18 bits of SACCH content */
-
-  //fprintf(stderr, "RAN=%02d - Part %d/4 ", RAN, PartOfFrame + 1);
-  if(CrcIsGood)
-  {
-    fprintf (stderr, "%s", KCYN);
-    fprintf (stderr, "RAN=%02d - Part %d/4 ", RAN, PartOfFrame + 1);
-    fprintf (stderr, "%s", KNRM);
-    //fprintf (stderr, "(CRC OK) ");
-    state->nxdn_last_ran = RAN; //disable, try to grab this in voice instead
-  }
-
-  else
-  {
-    fprintf (stderr, "%s", KRED);
-    fprintf (stderr, "(CRC ERR) ");
-    fprintf (stderr, "%s", KNRM);
-  }
-
-
-  /* Decode the SACCH only when all 4 voice frame
-   * SACCH spare parts have been received */
-  if(PartOfFrame == 3)
-  {
-    /* Decode the entire SACCH content */
-    NXDN_SACCH_Full_decode(opts, state);
-  }
-
-  for (i = 0; i < 144; i++)
-  {
-    dibit = getDibit (opts, state);
-#ifdef NXDN_DUMP
-    fprintf(stderr, "%c", dibit + 48);
-#endif
-  }
-
-  if (opts->errorbars == 1)
-  {
-    fprintf(stderr, "\n");
-  }
-
-  /* Reset the SACCH CRCs when all 4 voice frame
-   * SACCH spare parts have been received */
-  if(PartOfFrame == 3)
-  {
-    /* Reset all CRCs of the SACCH */
-    for(i = 0; i < 4; i++) state->NxdnSacchRawPart[i].CrcIsGood = 0;
-
-    //reset Scrambler seed
-    if (state->nxdn_cipher_type == 0x1)
-    {
-      state->payload_miN = 0; 
-    }
-
-  }
-} /* End processNXDNData() */

src/nxdn_frame.c

@@ -0,0 +1,524 @@
+//NXDN frame handler
+//Reworked portions from Osmocom OP25 rx_sync.cc
+
+/* -*- c++ -*- */
+/* 
+ * NXDN Encoder/Decoder (C) Copyright 2019 Max H. Parke KA1RBI
+ * 
+ * 
+ * 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.
+ */
+
+#include "dsd.h"
+#include "nxdn_const.h"
+
+#include <assert.h>
+
+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;
+	uint8_t answer[32];
+	uint8_t sacch_answer[32];
+	int lich_parity_received;
+	int lich_parity_computed;
+	int voice = 0;
+	int facch = 0;
+	int facch2 = 0;
+	int udch = 0;
+	int sacch = 0;
+	int cac = 0;
+
+	//new, and even more confusing NXDN Type-D / "IDAS" acronyms
+	int idas = 0;
+	int scch = 0;
+	int facch3 = 0;
+	int udch2 = 0;
+
+	//new breakdown of lich codes
+	uint8_t lich_rf = 0; //RF Channel Type
+	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];
+	uint8_t facch_bits_a[144];
+	uint8_t facch_bits_b[144];
+	uint8_t cac_bits[300];
+	uint8_t facch2_bits[348]; //facch2 or udch, same amount of bits
+	uint8_t facch3_bits[288]; //facch3 or udch2, same amount of bits
+
+	//nxdn bit buffer, for easy assignment handling
+	int nxdn_bit_buffer[364]; 
+	int nxdn_dibit_buffer[182];
+
+	//init all arrays
+	memset (dbuf, 0, sizeof(dbuf));
+	memset (answer, 0, sizeof(answer));
+	memset (sacch_answer, 0, sizeof(sacch_answer));
+	memset (lich_dibits, 0, sizeof(lich_dibits));
+	memset (sacch_bits, 0, sizeof(sacch_bits));
+	memset (facch_bits_b, 0, sizeof(facch_bits_b));
+	memset (facch_bits_a, 0, sizeof(facch_bits_a));
+	memset (cac_bits, 0, sizeof(cac_bits));
+	memset (facch2_bits, 0, sizeof(facch2_bits));
+
+	memset (nxdn_bit_buffer, 0, sizeof(nxdn_bit_buffer));
+	memset (nxdn_dibit_buffer, 0, sizeof(nxdn_dibit_buffer));
+
+	//collect lich bits first, if they are good, then we can collect the rest of them
+	for (int i = 0; i < 8; i++) lich_dibits[i] = dbuf[i] = getDibit(opts, state);
+
+	nxdn_descramble (lich_dibits, 8);
+	
+	lich = 0;
+	for (int i=0; i<8; i++) lich |= (lich_dibits[i] >> 1) << (7-i);
+		
+	lich_parity_received = lich & 1;
+	lich_parity_computed = ((lich >> 7) + (lich >> 6) + (lich >> 5) + (lich >> 4)) & 1;
+	lich = lich >> 1;
+	if (lich_parity_received != lich_parity_computed)
+	{
+		if (opts->payload == 1) fprintf(stderr, "  Lich Parity Error %02X\n", lich);
+		state->lastsynctype = -1; //set to -1 so we don't jump back here too quickly 
+		goto END;
+	}
+  
+	voice = 0;
+	facch = 0;
+	facch2 = 0;
+	sacch = 0;
+	cac = 0;
+
+	//test for inbound direction lich when trunking (false positive) and skip
+	//all inbound lich are even value (lsb is set to 0 for inbound direction)
+	if (lich % 2 == 0 && opts->p25_trunk == 1)
+	{
+		if (opts->payload == 1) fprintf(stderr, "  Simplex/Inbound NXDN lich on trunking system - type 0x%02X\n", lich);
+		state->lastsynctype = -1; //set to -1 so we don't jump back here too quickly 
+		goto END;
+	}
+
+	switch(lich) { //cases without breaks continue to flow downwards until they hit the break
+	case 0x01:	// CAC types
+	case 0x05:
+		cac = 1;
+		break;
+	case 0x28:  //facch2 types
+	case 0x29:
+	case 0x48:
+	case 0x49:
+		facch2 = 1;
+		break;
+	case 0x2e: //udch types
+	case 0x2f:
+	case 0x4e:
+	case 0x4f:
+		udch = 1;
+		break;
+	case 0x32:  //facch in 1, vch in 2
+	case 0x33:
+	case 0x52:
+	case 0x53:
+		voice = 2;	
+		facch = 1;
+		sacch = 1;
+		break;
+	case 0x34:  //vch in 1, facch in 2
+	case 0x35:
+	case 0x54:
+	case 0x55: //disabled for testing, IDAS system randomly triggers this one, probably due to poor signal
+		voice = 1;	
+		facch = 2;
+		sacch = 1;
+		break;
+	case 0x36:  //vch in both
+	case 0x37:
+	case 0x56: 
+	case 0x57: 
+		voice = 3;	
+		facch = 0;
+		sacch = 1;
+		break;
+	case 0x20: //facch in both 
+	case 0x21:
+	case 0x30:
+	case 0x31:
+	case 0x40:
+	case 0x41:
+	case 0x50:
+	case 0x51:
+		voice = 0;
+		facch = 3;	
+		sacch = 1;
+		break;
+	case 0x38: //sacch only (NULL?)
+	case 0x39:
+		sacch = 1;
+		break;
+
+	//NXDN "Type-D" or "IDAS" Specific Lich Codes
+	case 0x76: //normal vch voice (in one and two)
+	case 0x77: 
+		idas = 1;
+		scch = 1;
+		voice = 3;
+		break;
+	case 0x74: //vch in 1, facch1 in 2 (facch 2 steal)
+	case 0x75:
+		idas = 1;
+		scch = 1;
+		voice = 1;
+		facch = 2;
+		break;
+	case 0x72: //facch in 1, vch in 2 (facch 1 steal)
+	case 0x73:
+		idas = 1;
+		scch = 1;
+		voice = 2;
+		facch = 1;
+		break;
+	case 0x70: //facch steal in vch 1 and vch 2 (during voice only)
+	case 0x71:
+		idas = 1;
+		scch = 1;
+		facch = 3;
+		break;
+	case 0x6E: //udch2
+	case 0x6F:
+		idas = 1;
+		scch = 1;
+		udch2 = 1;
+		break;
+	case 0x68:
+	case 0x69: //facch3
+		idas = 1;
+		scch = 1;
+		facch3 = 1;
+		break;
+	case 0x62:
+	case 0x63: //facch1 in 1, null data and post field in 2
+		idas = 1;
+		scch = 1;
+		facch = 1;
+		break;
+	case 0x60:
+	case 0x61: //facch1 in both (non vch)
+		idas = 1;
+		scch = 1;
+		facch = 3;
+		break;
+
+	default:
+    if (opts->payload == 1) fprintf(stderr, "  false sync or unsupported NXDN lich type 0x%02X\n", lich);
+		//reset the sacch field, we probably got a false sync and need to wipe or give a bad crc
+		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));
+		state->lastsynctype = -1; //set to -1 so we don't jump back here too quickly 
+		voice = 0;
+		goto END;
+		break;
+	} // end of switch(lich)
+
+	//enable these after good lich parity and known lich value
+	state->carrier = 1;
+	state->last_cc_sync_time = time(NULL);
+
+	//printframesync after determining we have a good lich and it has something in it
+	if (idas)
+	{
+		if (opts->frame_nxdn48 == 1)
+		{
+			printFrameSync (opts, state, "IDAS D ", 0, "-");
+		}
+		if (opts->payload == 1) 
+			fprintf (stderr, "L%02X - ", lich);
+	}
+	else if (voice || facch || sacch || facch2 || udch || cac)
+	{
+		if (opts->frame_nxdn48 == 1)
+		{
+			printFrameSync (opts, state, "NXDN48 ", 0, "-");
+		}
+		else printFrameSync (opts, state, "NXDN96 ", 0, "-");
+		if (opts->payload == 1)
+			fprintf (stderr, "L%02X - ", lich);
+	}
+
+	//now that we have a good LICH, we can collect all of our dibits
+	//and push them to the proper places for decoding (if LICH calls for that type)
+	for (int i = 0; i < 174; i++) //192total-10FSW-8lich = 174
+	{
+	 	dbuf[i+8] = getDibit(opts, state);
+	}
+
+	nxdn_descramble (dbuf, 182); //sizeof(dbuf)
+
+	//seperate our dbuf (dibit_buffer) into individual bit array
+	for (int i = 0; i < 182; i++)
+	{
+		nxdn_bit_buffer[i*2]   = dbuf[i] >> 1;
+		nxdn_bit_buffer[i*2+1] = dbuf[i] & 1;
+	}
+
+	//sacch or scch bits
+	for (int i = 0; i < 60; i++)
+	{
+		sacch_bits[i] = nxdn_bit_buffer[i+16];
+	}
+	
+	//facch
+	for (int i = 0; i < 144; i++)
+	{
+		facch_bits_a[i] = nxdn_bit_buffer[i+16+60];
+		facch_bits_b[i] = nxdn_bit_buffer[i+16+60+144]; 
+	}
+
+	//cac
+	for (int i = 0; i < 300; i++)
+	{
+		cac_bits[i] = nxdn_bit_buffer[i+16];
+	}
+
+	//udch or facch2
+	for (int i = 0; i < 348; i++)
+	{
+		facch2_bits[i] = nxdn_bit_buffer[i+16];
+	}
+
+	//udch2 or facch3
+	for (int i = 0; i < 288; i++)
+	{
+		facch3_bits[i] = nxdn_bit_buffer[i+16+60];
+	}
+
+	//vch frames stay inside dbuf, easier to assign that to ambe_fr frames
+	//sacch needs extra handling depending on superframe or non-superframe variety
+
+	//Add advanced decoding of LICH (RF, FC, OPT, and Direction
+	lich_rf = (lich >> 5) & 0x3;
+	lich_fc = (lich >> 3) & 0x3;
+	lich_op = (lich >> 1) & 0x3;
+	if (lich % 2 == 0) direction = 0;
+	else direction = 1;
+
+	// RF Channel Type
+	if (lich_rf == 0) fprintf (stderr, "RCCH ");
+	else if (lich_rf == 1) fprintf (stderr, "RTCH ");
+	else if (lich_rf == 2) fprintf (stderr, "RDCH ");
+	else
+	{
+		if (lich < 0x60) fprintf (stderr, "RTCH_C ");
+		else fprintf (stderr, "RTCH2 ");
+	}
+
+	// Functional Channel Type -- things start to get really convoluted here
+	// These will echo when handled, either with the decoded message type, or relevant crc err
+	// if (lich_rf == 0) //CAC Type
+	// {
+	// 	//Technically, we should be checking direction as well, but the fc never has split meaning on CAC
+	// 	if (lich_fc == 0) fprintf (stderr, "CAC ");
+	// 	else if (lich_fc == 1) fprintf (stderr, "Long CAC ");
+	// 	else if (lich_fc == 3) fprintf (stderr, "Short CAC ");
+	// 	else fprintf (stderr, "Reserved ");
+	// }
+	// else //USC Type
+	// {
+	// 	if (lich_fc == 0) fprintf (stderr, "NSF SACCH ");
+	// 	else if (lich_fc == 1) fprintf (stderr, "UDCH ");
+	// 	else if (lich_fc == 2) fprintf (stderr, "SF SACCH ");
+	// 	else if (lich_fc == 3) fprintf (stderr, "SF SACCH/IDLE ");
+	// }
+
+#ifdef LIMAZULUTWEAKS
+
+  //LimaZulu specific tweak, load keys from frequency value, if avalable -- test before VCALL
+	//needs to be loaded here, if superframe data pair, then we need to run the LFSR on it as well
+
+	if (voice) //can this run TOO frequently?
+	{
+		long int freq = 0;
+		uint8_t hash_bits[24];
+		memset (hash_bits, 0, sizeof(hash_bits));
+		uint16_t limazulu = 0;
+			
+		//if not available, then poll rigctl if its available
+		if (opts->use_rigctl == 1)
+			freq = GetCurrentFreq (opts->rigctl_sockfd);
+
+		//if using rtl input, we can ask for the current frequency tuned
+		else if (opts->audio_in_type == 3)
+			freq = (long int)opts->rtlsdr_center_freq;
+
+		// freq = 167831250; //hardset for  testing
+
+		//since a frequency value will be larger than the 16-bit max, we need to hash it first
+		//the hash has to be run the same way as the import, so at a 24-bit depth, which hopefully
+		//will not lead to any duplicate key loads due to multiple CRC16 collisions on a larger value?
+		for (int i = 0; i < 24; i++)
+			hash_bits[i] = ((freq << i) & 0x800000) >> 23; //load into array for CRC16 
+
+		if (freq) limazulu = ComputeCrcCCITT16d (hash_bits, 24);
+		limazulu = limazulu & 0xFFFF; //make sure no larger than 16-bits
+
+		fprintf (stderr, "%s", KYEL);
+		if (freq) fprintf (stderr, "\n Freq: %ld - Freq Hash: %d", freq, limazulu);
+		if (state->rkey_array[limazulu] != 0) fprintf (stderr, " - Key Loaded: %lld", state->rkey_array[limazulu]);
+		fprintf (stderr, "%s", KNRM);
+
+		if (state->rkey_array[limazulu] != 0) 
+			state->R = state->rkey_array[limazulu];
+
+		if (state->R != 0 && state->M == 1) state->nxdn_cipher_type = 0x1;
+
+		//add additional time to last_sync_time for LimaZulu to hold on current frequency
+		//a little longer without affecting normal scan time on trunk_hangtime variable
+		state->last_cc_sync_time = time(NULL) + 2; //ask him for an ideal wait timer
+	}
+
+#endif //end LIMAZULUTWEAKS
+
+	if (opts->scanner_mode == 1)
+		state->last_cc_sync_time = time(NULL) + 2; //add a little extra hangtime between resuming scan
+
+	//Option/Steal Flags echoed in Voice, V+F, or Data 
+	if (voice && !facch) //voice only, no facch steal
+	{
+		fprintf (stderr, "%s", KGRN);
+		fprintf (stderr, " Voice ");
+		fprintf (stderr, "%s", KNRM);
+	}
+	else if (voice && facch) //voice with facch1 steal
+	{
+		fprintf (stderr, "%s", KGRN);
+		fprintf (stderr, " V%d+F%d ", 3 - facch, facch); //print which position on each
+		fprintf (stderr, "%s", KNRM);
+	}
+	else //Covers FACCH1 in both, FACCH2, UDCH, UDCH2, CAC
+	{
+		fprintf (stderr, "%s", KCYN);
+		fprintf (stderr, " Data  ");
+		fprintf (stderr, "%s", KNRM);
+
+		//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) 
+		{
+			char ambe_temp[49] = {0};
+			char ambe_d[49] = {0};
+			for (int i = 0; i < 4; i++)
+			{
+				LFSRN(ambe_temp, ambe_d, state);
+			}
+		}
+
+	}
+
+	if (voice && facch == 1) //facch steal 1 -- before voice
+	{
+		//force scrambler here, but with unspecified key (just use what's loaded)
+		if (state->M == 1 && state->R != 0) state->nxdn_cipher_type = 0x1; 
+		//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)
+		{
+			char ambe_temp[49] = {0};
+			char ambe_d[49] = {0};
+			for (int i = 0; i < 2; i++)
+			{
+				LFSRN(ambe_temp, ambe_d, state);
+			}
+		}  
+	}
+
+	if (lich == 0x20 || lich == 0x21 || lich == 0x61 || lich == 0x40 || lich == 0x41) state->nxdn_sacch_non_superframe = TRUE;
+	else state->nxdn_sacch_non_superframe = FALSE;
+
+	//TODO Later: Add Direction and/or LICH to all decoding functions
+	if (scch) nxdn_deperm_scch (opts, state, sacch_bits, direction);
+
+	if (udch2)  nxdn_deperm_facch3_udch2(opts, state, facch3_bits, 0);
+	if (facch3) nxdn_deperm_facch3_udch2(opts, state, facch3_bits, 1);
+
+	if (sacch)  nxdn_deperm_sacch(opts, state, sacch_bits);
+	if (cac)    nxdn_deperm_cac(opts, state, cac_bits);
+
+	//Seperated UDCH user data from facch2 data 
+	if (udch)   nxdn_deperm_facch2_udch(opts, state, facch2_bits, 0);
+	if (facch2) nxdn_deperm_facch2_udch(opts, state, facch2_bits, 1);
+
+	//SHOULD be okay to run facch1's again on steal frames, will need testing
+	// if (facch & 1) nxdn_deperm_facch(opts, state, facch_bits_a);
+	// if (facch & 2) nxdn_deperm_facch(opts, state, facch_bits_b);
+
+	//only run facch in second slot if its not equal to the first one
+	//ideally, this would work better AFTER decoding/FEC
+	if (facch & 1) nxdn_deperm_facch(opts, state, facch_bits_a);
+	if (facch & 2)
+	{
+		if (memcmp (facch_bits_a, facch_bits_b, 144) != 0)
+			nxdn_deperm_facch(opts, state, facch_bits_b);
+	}
+
+	if (voice)
+	{
+		//restore MBE file open here
+		if ((opts->mbe_out_dir[0] != 0) && (opts->mbe_out_f == NULL)) openMbeOutFile (opts, state);
+		//update last voice sync time
+		state->last_vc_sync_time = time(NULL);
+		//turn on scrambler if forced by user option
+		if (state->M == 1 && state->R != 0) state->nxdn_cipher_type = 0x1;
+		//process voice frame
+		nxdn_voice (opts, state, voice, dbuf); 
+	}
+
+	//close MBE file if no voice and its open
+	if (!voice)
+	{
+		if (opts->mbe_out_f != NULL)
+		{
+			if (opts->frame_nxdn96 == 1) //nxdn96 has pure voice and data frames mixed together, so we will need to do a time check first
+			{
+				if ( (time(NULL) - state->last_vc_sync_time) > 1) //test for optimal time, 1 sec should be okay
+				{
+					closeMbeOutFile (opts, state);
+				} 
+			}
+			//may need to reconsider this, due to double FACCH1 steals on some Type-C (ASSGN_DUP, etc) and Conventional Systems (random IDLE FACCH1 steal for no reason)
+			if (opts->frame_nxdn48 == 1) closeMbeOutFile (opts, state); //okay to close right away if nxdn48, no data/voice frames mixing
+		} 
+	}
+
+	if (voice && facch == 2) //facch steal 2 -- after voice 1
+	{
+		//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)
+		{
+			char ambe_temp[49] = {0};
+			char ambe_d[49] = {0};
+			for (int i = 0; i < 2; i++)
+			{
+				LFSRN(ambe_temp, ambe_d, state);
+			}
+		}  
+	}
+	
+	if (opts->payload == 1 && !voice) fprintf (stderr, "\n");
+	else if (opts->payload == 0) fprintf (stderr, "\n");
+
+	END: ; //do nothing
+}

src/nxdn_voice.c

@@ -1,169 +1,107 @@
+//a new and simplified voice handling routine for NXDN based on lich signalling
+/*
+ * 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.
+ */
+
+ //Originally found at - https://github.com/LouisErigHerve/dsd
+ //Modified for use in DSD-FME
+
 #include "dsd.h"
-#include "nxdn_const.h"
 
-void processNXDNVoice (dsd_opts * opts, dsd_state * state)
+const int nW[36] = { 0, 1, 0, 1, 0, 1,
+  0, 1, 0, 1, 0, 1,
+  0, 1, 0, 1, 0, 1,
+  0, 1, 0, 1, 0, 2,
+  0, 2, 0, 2, 0, 2,
+  0, 2, 0, 2, 0, 2
+};
+
+const int nX[36] = { 23, 10, 22, 9, 21, 8,
+  20, 7, 19, 6, 18, 5,
+  17, 4, 16, 3, 15, 2,
+  14, 1, 13, 0, 12, 10,
+  11, 9, 10, 8, 9, 7,
+  8, 6, 7, 5, 6, 4
+};
+
+const int nY[36] = { 0, 2, 0, 2, 0, 2,
+  0, 2, 0, 3, 0, 3,
+  1, 3, 1, 3, 1, 3,
+  1, 3, 1, 3, 1, 3,
+  1, 3, 1, 3, 1, 3,
+  1, 3, 1, 3, 1, 3
+};
+
+const int nZ[36] = { 5, 3, 4, 2, 3, 1,
+  2, 0, 1, 13, 0, 12,
+  22, 11, 21, 10, 20, 9,
+  19, 8, 18, 7, 17, 6,
+  16, 5, 15, 4, 14, 3,
+  13, 2, 12, 1, 11, 0
+};
+
+void nxdn_voice (dsd_opts * opts, dsd_state * state, int voice, uint8_t dbuf[182])
 {
-  int i, j, dibit;
+  int i;
+  int start, stop;
   char ambe_fr[4][24];
-  unsigned char sacch_raw[72] = {0};
+
-  unsigned char sacch_decoded[32] = {0}; /* 26 bit + 6 bit CRC */
   const int *w, *x, *y, *z;
-  unsigned char *pr;
-  uint8_t CrcIsGood = 0;
-  uint8_t StructureField = 0;
-  uint8_t RAN = 0;
-  uint8_t PartOfFrame = 0;
-  char ambe7bytesArray[7] = {0};
-  int PartOfEncryptedSuperFrame = 0;
 
-  if (opts->errorbars == 1)
+  //these conditions will determine our starting and stopping value for voice
-  {
+  //i.e. voice in first, voice in second, or voice in both
-    fprintf(stderr, "VOICE - ");
+  if (voice == 1 || voice == 3) start = 0;
-  }
+  if (voice == 1) stop = 2;
+  if (voice == 2) start = 2;
+  if (voice == 2 || voice == 3) stop = 4;
 
-  /* Start pseudo-random NXDN sequence after
+  for (start; start < stop; start++)
-   * LICH = 16 bit = 8 dibit
-   * ==> Index 8 */
-  pr = (unsigned char *)(&nxdnpr2[8]);
-  for (i = 0; i < 30; i++)
-  {
-    dibit = getDibit (opts, state);
-
-    /* Store and de-interleave directly SACCH bits */
-    sacch_raw[(2*i)]   = ((*pr) & 1) ^ (1 & (dibit >> 1));  // bit 1
-    sacch_raw[(2*i)+1] = (1 & dibit);               // bit 0
-
-// TODO : Deinterleave is done in the "NXDN_SACCH_decode" function
-//    /* Store and de-interleave directly SACCH bits */
-//    sacch_raw[nsW[2*i]]   = *pr ^ (1 & (dibit >> 1));  // bit 1
-//    sacch_raw[nsW[2*i+1]] = (1 & dibit);               // bit 0
-    pr++;
-#ifdef NXDN_DUMP
-    fprintf(stderr, "%c", dibit + 48);
-#endif
-  }
-#ifdef NXDN_DUMP
-  fprintf(stderr, " ");
-#endif
-
-// TODO : Unpuncture is done in the "NXDN_SACCH_decode" function
-//  /* For the sake of simplicity, handle the re-insertion of punctured bits here.
-//   * This makes the actual Viterbi decoder code a LOT simpler. */
-//  for (i = 30; i < 36; i++)
-//  {
-//    sacch_raw[nsW[2*i]]   = 0;
-//    sacch_raw[nsW[2*i+1]] = 0;
-//  }
-
-  /* Decode the SACCH fields */
-  CrcIsGood = NXDN_SACCH_raw_part_decode(sacch_raw, sacch_decoded);
-  StructureField = (sacch_decoded[0]<<1 | sacch_decoded[1]<<0) & 0x03; /* Compute the Structure Field (remove 2 first bits of the SR Information in the SACCH) */
-  RAN = (sacch_decoded[2]<<5 | sacch_decoded[3]<<4 | sacch_decoded[4]<<3 | sacch_decoded[5]<<2 | sacch_decoded[6]<<1 | sacch_decoded[7]<<0) & 0x3F; /* Compute the RAN (6 last bits of the SR Information in the SACCH) */
-
-  /* Compute the Part of Frame according to the structure field */
-  if     (StructureField == 3) PartOfFrame = 0;
-  else if(StructureField == 2) PartOfFrame = 1;
-  else if(StructureField == 1) PartOfFrame = 2;
-  else if(StructureField == 0) PartOfFrame = 3;
-  else PartOfFrame = 0; /* Normally we should never go here */
-
-  /* Fill the SACCH structure */
-  state->NxdnSacchRawPart[PartOfFrame].CrcIsGood = CrcIsGood;
-  state->NxdnSacchRawPart[PartOfFrame].StructureField = StructureField;
-  state->NxdnSacchRawPart[PartOfFrame].RAN = RAN;
-  memcpy(state->NxdnSacchRawPart[PartOfFrame].Data, &sacch_decoded[8], 18); /* Copy the 18 bits of SACCH content */
-
-  //fprintf(stderr, "RAN=%02d - Part %d/4 ", RAN, PartOfFrame + 1);
-  //if(CrcIsGood) fprintf(stderr, "   (OK)   - ");
-  if(CrcIsGood)
-  {
-    fprintf (stderr, "%s", KCYN);
-    fprintf (stderr, "RAN=%02d - Part %d/4 ", RAN, PartOfFrame + 1);
-    fprintf (stderr, "%s", KNRM);
-    //fprintf (stderr, "(CRC OK) ");
-    state->nxdn_last_ran = RAN; //disable, try to grab this in voice instead
-  }
-  else
-  {
-    fprintf (stderr, "%s", KRED);
-    fprintf(stderr, "(CRC ERR) ");
-    fprintf (stderr, "%s", KNRM);
-  }
-
-
-  /* Determine the current part of superframe
-   * (in an AES or DES encrypted frame, two superframes
-   * are used with the same IV, so to decipher the sound
-   * correctly we must know the current superframe part) */
-  if(state->NxdnElementsContent.PartOfNextEncryptedFrame == 1) PartOfEncryptedSuperFrame = 0;
-  else if(state->NxdnElementsContent.PartOfNextEncryptedFrame == 2) PartOfEncryptedSuperFrame = 1;
-  else PartOfEncryptedSuperFrame = 0;
-
-  /* Decode the SACCH only when all 4 voice frame
-   * SACCH spare parts have been received */
-  if(PartOfFrame == 3)
-  {
-    /* Decode the entire SACCH content */
-    NXDN_SACCH_Full_decode(opts, state);
-  }
-
-
-  if (opts->errorbars == 1)
-  {
-    //fprintf(stderr, "e:");
-  }
-
-  /* Start pseudo-random NXDN sequence after
-   * LICH = 16 bit = 8 dibit +
-   * SACCH = 60 bit = 30 dibit
-   * = 76 bit = 38 dibit
-   * ==> Index 38 */
-  pr = (unsigned char *)(&nxdnpr2[38]);
-  for (j = 0; j < 4; j++)
   {
     w = nW;
     x = nX;
     y = nY;
     z = nZ;
+
     for (i = 0; i < 36; i++)
     {
-      dibit = getDibit (opts, state);
-#ifdef NXDN_DUMP
-      fprintf(stderr, "%c", dibit + 48);
-#endif
-      ambe_fr[*w][*x] = *pr ^ (1 & (dibit >> 1)); // bit 1
-      pr++;
-      ambe_fr[*y][*z] = (1 & dibit);              // bit 0
 
+      //skip 8 lich and 30 sacch dibits already in buffer plus 36 times start position
+      ambe_fr[*w][*x] = dbuf[i+38+start*36] >> 1; 
+      ambe_fr[*y][*z] = dbuf[i+38+start*36] & 1; 
+  
       w++;
       x++;
       y++;
       z++;
-    }
+
-    if (opts->payload == 1)
-    {
-      //fprintf(stderr, "\n");
     }
     processMbeFrame (opts, state, NULL, ambe_fr, NULL);
-    state->p25vc++; //increment counter by one here?
 
-  } /* End for (j = 0; j < 4; j++) */
+    memcpy (state->f_l, state->audio_out_temp_buf, sizeof(state->f_l));
-
+    
-  if (opts->errorbars == 1)
+    if (opts->floating_point == 0 )
+      playSynthesizedVoice(opts, state);
+    if (opts->floating_point == 1)
+      playSynthesizedVoiceFM(opts, state);
+  }
+  
+  if (opts->payload == 1)
   {
     fprintf(stderr, "\n");
   }
+  
 
-  /* Reset the SACCH CRCs when all 4 voice frame
+}
-   * SACCH spare parts have been received */
-  if(PartOfFrame == 3)
-  {
-    /* Reset all CRCs of the SACCH */
-    if (state->R > 0 && state->nxdn_cipher_type == 0x1)
-    {
-      state->payload_miN = state->R;
-    }
-    for(i = 0; i < 4; i++) state->NxdnSacchRawPart[i].CrcIsGood = 0;
-
-  }
-} /* End processNXDNVoice() */

src/p25_12.c

@@ -0,0 +1,167 @@
+/*-------------------------------------------------------------------------------
+ * 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

@@ -0,0 +1,168 @@
+/*-------------------------------------------------------------------------------
+ * 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

@@ -2,14 +2,18 @@
  * p25_frequency.c
  * P25 Channel to Frequency Calculator
  *
+ * NXDN Channel to Frequency Calculator
+ * 
  * LWVMOBILE
- * 2022-09 DSD-FME Florida Man Edition
+ * 2022-11 DSD-FME Florida Man Edition
  *-----------------------------------------------------------------------------*/
 
 #include "dsd.h"
 
+//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).
@@ -28,17 +32,88 @@ long int process_channel_to_freq (dsd_opts * opts, dsd_state * state, int channe
 	int type = state->p25_chan_type[iden];
 	int slots_per_carrier[16] = {1,1,1,2,4,2,2,2,2,2,2,2,2,2,2,2}; //from OP25
 	int step = (channel & 0xFFF) / slots_per_carrier[type];
-	
+
-	if (state->p25_base_freq[iden] != 0)
+	//first, check channel map
+	if (state->trunk_chan_map[channel] != 0)
 	{
-		freq = (state->p25_base_freq[iden] * 5) + ( step * state->p25_chan_spac[iden] * 125);
+		freq = state->trunk_chan_map[channel];
-        fprintf (stderr, "\n  Frequency [%.6lf] MHz", (double)freq/1000000);
+		fprintf (stderr, "\n  Frequency [%.6lf] MHz", (double)freq/1000000);
-        return (freq);
+		return (freq);
 	}
-	else 
+
-    {
+	//if not found, attempt to find it via calculation 
-        fprintf (stderr, "\n  Base Frequency Not Found - Iden [%d]", iden);
+	else
-        return (0);
+	{
-    }
+		if (state->p25_base_freq[iden] != 0)
+		{
+			freq = (state->p25_base_freq[iden] * 5) + ( step * state->p25_chan_spac[iden] * 125);
+					fprintf (stderr, "\n  Frequency [%.6lf] MHz", (double)freq/1000000);
+					return (freq);
+		}
+		else 
+		{
+				fprintf (stderr, "\n  Base Frequency Not Found - Iden [%d]", iden);
+				fprintf(stderr, "\n    or Channel not found in import file");
+				return (0);
+		}
+	}	
+
+}
+
+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;
+
+	//reworked to include Direct Frequency Assignment if available
+
+	//first, check channel map for imported value, DFA systems most likely won't need an import,
+	//unless it has 'system definable' attributes
+	if (state->trunk_chan_map[channel] != 0)
+	{
+		freq = state->trunk_chan_map[channel];
+		fprintf (stderr, "\n  Frequency [%.6lf] MHz", (double)freq/1000000);
+		return (freq);
+	}
+
+	//then, let's see if its DFA instead -- 6.5.36
+	else if (state->nxdn_rcn == 1)
+	{
+		//determine the base frequency in Hz
+		if (state->nxdn_base_freq == 1)				base = 100000000; //100 MHz
+		else if (state->nxdn_base_freq == 2) 	base = 330000000; //330 Mhz
+		else if (state->nxdn_base_freq == 3)	base = 400000000; //400 Mhz
+		else if (state->nxdn_base_freq == 4)	base = 750000000; //750 Mhz
+		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
+		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
+		//6.5.45. Outbound/Inbound Frequency Number (OFN/IFN)
+		if (base && step)
+		{
+			freq = base + (channel * step);
+			fprintf (stderr, "\n  DFA Frequency [%.6lf] MHz", (double)freq/1000000);
+			return (freq);
+		}
+		else 
+		{
+			fprintf(stderr, "\n    Custom DFA Settings -- Unknown Freq;");
+			return (0);
+		}
+		
+	}
+
+	else
+	{
+		fprintf(stderr, "\n    Channel not found in import file");
+		return (0);
+	} 
 
 }

src/p25_lcw.c

@@ -1,160 +1,451 @@
+/*-------------------------------------------------------------------------------
+ * p25_lcw.c
+ * P25p1 Link Control Word Decoding
+ *
+ * LWVMOBILE
+ * 2023-05 DSD-FME Florida Man Edition
+ *-----------------------------------------------------------------------------*/
+
 #include "dsd.h"
 
-void
+//new p25_lcw function here -- TIA-102.AABF-D LCW Format Messages (if anybody wants to fill the rest out)
-processP25lcw (dsd_opts * opts, dsd_state * state, char *lcformat, char *mfid, char *lcinfo)
+void p25_lcw (dsd_opts * opts, dsd_state * state, uint8_t LCW_bits[], uint8_t irrecoverable_errors)
 {
+  UNUSED(irrecoverable_errors);
 
-  char tgid[17], tmpstr[255];
+  uint8_t lc_format = (uint8_t)ConvertBitIntoBytes(&LCW_bits[0], 8);  //format
-  long talkgroup, source;
+  uint8_t lc_opcode = (uint8_t)ConvertBitIntoBytes(&LCW_bits[2], 6);  //opcode portion of format
-  int i, j;
+  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);
 
-  tgid[16] = 0;
+  if (lc_pf == 1) //check the protect flag -- if set, its an encrypted lcw
+  {
+    fprintf (stderr, "%s",KRED);
+    fprintf (stderr, " LCW Protected ");
+    fprintf (stderr, "%s",KNRM);
+  }
 
-  if (opts->p25lc == 1)
+  if (lc_pf == 0) //not protected/encrypted lcw
-    {
+  {
-      fprintf (stderr, "lcformat: %s mfid: %s lcinfo: %s ", lcformat, mfid, lcinfo);
-      if (opts->p25tg == 0)
-        {
-          fprintf (stderr, "\n");
-        }
-    }
 
-  if (strcmp (lcformat, "00000100") == 0)
+    if (opts->payload == 1) fprintf (stderr, " LCW"); 
+
+    //check to see if we need to run these as MFID 0 or 1 only (standard)
+    if (lc_mfid == 0 || lc_mfid == 1) //lc_mfid == 0
     {
 
-      // first tg is the active channel
+      //check the service options on applicable formats
-      j = 0;
+      if (lc_format == 0x4A || lc_format == 0x46 || lc_format == 0x45 
-      for (i = 40; i < 52; i++)
+          || lc_format == 0x44 || lc_format == 0x03 || lc_format == 0x00)
+      {
+
+        if (lc_svcopt & 0x80) fprintf (stderr, " Emergency");
+        if (lc_svcopt & 0x40) fprintf (stderr, " Encrypted");
+
+        if (opts->payload == 1) //hide behind payload due to len
         {
-          if (state->tgcount < 24)
+          if (lc_svcopt & 0x20) fprintf (stderr, " Duplex");
-            {
+          if (lc_svcopt & 0x10) fprintf (stderr, " Packet");
-              state->tg[state->tgcount][j] = lcinfo[i];
+          else fprintf (stderr, " Circuit");
-            }
+          if (lc_svcopt & 0x8) fprintf (stderr, " R"); //reserved bit is on
-          tmpstr[j] = lcinfo[i];
+          fprintf (stderr, " Priority %d", lc_svcopt & 0x7); //call priority
-          j++;
         }
-      tmpstr[12] = 48;
+      }
-      tmpstr[13] = 48;
+
-      tmpstr[14] = 48;
+      if (lc_format == 0x00)
-      tmpstr[15] = 48;
+      {
-      tmpstr[16] = 0;
+        fprintf (stderr, " Group Voice Channel User");
-      talkgroup = strtol (tmpstr, NULL, 2);
+        uint8_t res    = (uint8_t)ConvertBitIntoBytes(&LCW_bits[24], 7);
-      state->lasttg = talkgroup;
+        uint8_t explicit = LCW_bits[24]; //explicit source id required == 1, full SUID on seperate LCW
-      if (state->tgcount < 24)
+        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;
+        if (source != 0) state->lastsrc = source;
+
+        sprintf (state->call_string[0], "   Group ");
+        if (lc_svcopt & 0x80) strcat (state->call_string[0], " Emergency  ");
+        else if (lc_svcopt & 0x40) strcat (state->call_string[0], " Encrypted  ");
+        else strcat (state->call_string[0], "            ");
+      }
+
+      else if (lc_format == 0x03)
+      {
+        fprintf (stderr, " Unit to Unit Voice Channel User");
+        uint32_t target = (uint32_t)ConvertBitIntoBytes(&LCW_bits[24], 24);
+        uint32_t source = (uint32_t)ConvertBitIntoBytes(&LCW_bits[48], 24);
+        fprintf (stderr, " - Target %d Source %d", target, source);
+
+        //don't set this when zero, annoying blink occurs in ncurses
+        if (target != 0) state->lasttg = target;
+        if (source != 0) state->lastsrc = source;
+
+        sprintf (state->call_string[0], " Private ");
+        if (lc_svcopt & 0x80) strcat (state->call_string[0], " Emergency  ");
+        else if (lc_svcopt & 0x40) strcat (state->call_string[0], " Encrypted  ");
+        else strcat (state->call_string[0], "            ");
+
+      }
+
+      //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
+      else if (lc_format == 0x42) //is this group only, or group and private?
+      {
+        fprintf (stderr, " Group Voice Channel Update - ");
+        uint16_t channel1 = (uint16_t)ConvertBitIntoBytes(&LCW_bits[8], 16);
+        uint16_t group1   = (uint16_t)ConvertBitIntoBytes(&LCW_bits[24], 16);
+        uint16_t channel2 = (uint16_t)ConvertBitIntoBytes(&LCW_bits[40], 16);
+        uint16_t group2   = (uint16_t)ConvertBitIntoBytes(&LCW_bits[56], 16);
+
+        if (channel1 && group1)
         {
-          state->tgcount = state->tgcount + 1;
+          fprintf (stderr, "Ch: %04X TG: %d; ", channel1, group1);
-        }
+          sprintf (state->active_channel[0], "Active Ch: %04X TG: %d; ", channel1, group1);
-      if (opts->p25tg == 1)
+          state->last_active_time = time(NULL);
-        {
-          fprintf (stderr, "tg: %li ", talkgroup);
         }
 
-      if (opts->p25tg == 1)
+        if (channel2 && group2 && group1 != group2)
         {
-          fprintf (stderr, "tg: %li ", talkgroup);
+          fprintf (stderr, "Ch: %04X TG: %d; ", channel2, group2);
-
+          sprintf (state->active_channel[1], "Active Ch: %04X TG: %d; ", channel2, group2);
-          // the remaining 3 appear to be other active tg's on the system
+          state->last_active_time = time(NULL);
-          j = 0;
-          for (i = 28; i < 40; i++)
-            {
-              tmpstr[j] = lcinfo[i];
-              j++;
-            }
-          tmpstr[12] = 48;
-          tmpstr[13] = 48;
-          tmpstr[14] = 48;
-          tmpstr[15] = 48;
-          tmpstr[16] = 0;
-          talkgroup = strtol (tmpstr, NULL, 2);
-          fprintf (stderr, "%li ", talkgroup);
-          j = 0;
-          for (i = 16; i < 28; i++)
-            {
-              tmpstr[j] = lcinfo[i];
-              j++;
-            }
-          tmpstr[12] = 48;
-          tmpstr[13] = 48;
-          tmpstr[14] = 48;
-          tmpstr[15] = 48;
-          tmpstr[16] = 0;
-          talkgroup = strtol (tmpstr, NULL, 2);
-          fprintf (stderr, "%li ", talkgroup);
-          j = 0;
-          for (i = 4; i < 16; i++)
-            {
-              tmpstr[j] = lcinfo[i];
-              j++;
-            }
-          tmpstr[12] = 48;
-          tmpstr[13] = 48;
-          tmpstr[14] = 48;
-          tmpstr[15] = 48;
-          tmpstr[16] = 0;
-          talkgroup = strtol (tmpstr, NULL, 2);
-          fprintf (stderr, "%li\n", talkgroup);
         }
+
+      }
+
+      else if (lc_format == 0x44)
+      {
+        fprintf (stderr, " Group Voice Channel Update – Explicit");
+        uint16_t group1   = (uint16_t)ConvertBitIntoBytes(&LCW_bits[24], 16);
+        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)
+      {
+        fprintf (stderr, " Unit to Unit Answer Request");
+      }
+
+      else if (lc_format == 0x46)
+      {
+        fprintf (stderr, " Telephone Interconnect Voice Channel User");
+      }
+
+      else if (lc_format == 0x47)
+      {
+        fprintf (stderr, " Telephone Interconnect Answer Request");
+      }
+
+      else if (lc_format == 0x49)
+      {
+        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 suid   = (uint32_t)ConvertBitIntoBytes(&LCW_bits[40], 24);
+        fprintf (stderr, "TGT: %04X SUID: %d; ", target, suid);
+      }
+
+      else if (lc_format == 0x50)
+      {
+        fprintf (stderr, " Group Affiliation Query");
+      }
+
+      else if (lc_format == 0x51)
+      {
+        fprintf (stderr, " Unit Registration Command");
+      }
+
+      else if (lc_format == 0x52) //wonder if anybody uses this if its deleted/obsolete
+      {
+        fprintf (stderr, " Unit Authentication Command - OBSOLETE");
+      }
+
+      else if (lc_format == 0x53) 
+      {
+        fprintf (stderr, " Status Query");
+      }
+
+      else if (lc_format == 0x54) 
+      {
+        fprintf (stderr, " Status Update");
+      }
+
+      else if (lc_format == 0x55) 
+      {
+        fprintf (stderr, " Status Update");
+      }
+
+      else if (lc_format == 0x56) 
+      {
+        fprintf (stderr, " Call Alert");
+      }
+
+
+      else if (lc_format == 0x5A) 
+      {
+        fprintf (stderr, " Status Update – Source ID Extension Required");
+      }
+
+      else if (lc_format == 0x5C) 
+      {
+        fprintf (stderr, " Extended Function Command – Source ID Extension Required");
+      }
+
+      else if (lc_format == 0x60) 
+      {
+        fprintf (stderr, " System Service Broadcast");
+      }
+
+      else if (lc_format == 0x61) 
+      {
+        fprintf (stderr, " Secondary Control Channel Broadcast");
+      }
+
+      else if (lc_format == 0x62) 
+      {
+        fprintf (stderr, " Adjacent Site Status Broadcast");
+      }
+
+      else if (lc_format == 0x63) 
+      {
+        fprintf (stderr, " RFSS Status Broadcast");
+      }
+
+      else if (lc_format == 0x64) 
+      {
+        fprintf (stderr, " Network Status Broadcast");
+      }
+
+      else if (lc_format == 0x65) 
+      {
+        fprintf (stderr, " Protection Parameter Broadcast - OBSOLETE");
+      }
+
+
+      else if (lc_format == 0x66) 
+      {
+        fprintf (stderr, " Secondary Control Channel Broadcast – Explicit (LCSCBX)");
+      }
+
+      else if (lc_format == 0x67) //explicit
+      {
+        fprintf (stderr, " Adjacent Site Status (LCASBX)");
+        uint8_t lra = (uint8_t)ConvertBitIntoBytes(&LCW_bits[8], 8);
+        uint16_t channelt = (uint16_t)ConvertBitIntoBytes(&LCW_bits[16], 16);
+        uint8_t rfssid = (uint8_t)ConvertBitIntoBytes(&LCW_bits[32], 8);
+        uint8_t siteid = (uint8_t)ConvertBitIntoBytes(&LCW_bits[40], 8);
+        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  ");
+        // fprintf (stderr, "  LRA [%02X] RFSS [%03d] SITE [%03d] CHAN-T [%04X] CHAN-R [%02X] CFVA [%X]\n  ", lra, rfssid, siteid, channelt, channelr, cfva);
+        // if (cfva & 0x8) fprintf (stderr, " Conventional");
+        // 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");
+        // process_channel_to_freq (opts, state, channelt);
+        //end debug, way too much for a simple link control line 
+
+
+      }
+
+      else if (lc_format == 0x68) 
+      {
+        fprintf (stderr, " RFSS Status Broadcast – Explicit (LCRSBX)");
+      }
+
+      else if (lc_format == 0x69) 
+      {
+        fprintf (stderr, " Network Status Broadcast – Explicit (LCNSBX)");
+      }
+
+      else if (lc_format == 0x6A) 
+      {
+        fprintf (stderr, " Conventional Fallback");
+      }
+
+      else if (lc_format == 0x6B) 
+      {
+        fprintf (stderr, " Message Update – Source ID Extension Required");
+      }
+
+      //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);
+        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)
+          {
+            initialize_p25_heuristics(&state->p25_heuristics);
+            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)
+          {
+            state->lasttg = 0;
+            state->lastsrc = 0;
+            state->payload_algid = 0; 
+            state->payload_keyid = 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->payload_algid = 0;
+            state->payload_keyid = 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
+          }
+        }
+      }
+
+      else fprintf (stderr, " Unknown Format %02X MFID %02X SVC %02X", lc_format, lc_mfid, lc_svcopt);
     }
 
-  else if (strcmp (lcformat, "00000000") == 0)
+    //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)
     {
-      j = 0;
+      uint8_t iden = (uint8_t)ConvertBitIntoBytes(&LCW_bits[8], 4);
-      if (strcmp (mfid, "10010000") == 0)
+      uint32_t base = (uint32_t)ConvertBitIntoBytes(&LCW_bits[40], 32);
-        {
+      fprintf (stderr, " Channel Identifier Update VU; Iden: %X; Base: %d;", iden, base*5);
-          for (i = 20; i < 32; i++)
+    }
-            {
-              if (state->tgcount < 24)
-                {
-                  state->tg[state->tgcount][j] = lcinfo[i];
-                }
-              tmpstr[j] = lcinfo[i];
-              j++;
-            }
-          tmpstr[12] = 48;
-          tmpstr[13] = 48;
-          tmpstr[14] = 48;
-          tmpstr[15] = 48;
-        }
-      else
-        {
-          for (i = 16; i < 32; i++)
-            {
-              if (state->tgcount < 24)
-                {
-                  state->tg[state->tgcount][j] = lcinfo[i];
-                }
-              tmpstr[j] = lcinfo[i];
-              j++;
-            }
-        }
-      tmpstr[16] = 0;
-      talkgroup = strtol (tmpstr, NULL, 2);
-      state->lasttg = talkgroup;
-      if (state->tgcount < 24)
-        {
-          state->tgcount = state->tgcount + 1;
-        }
-      if (opts->p25tg == 1)
-        {
-          fprintf (stderr, "tg: %li ", talkgroup);
-        }
 
-      j = 0;
+    //This lc_format doesn't use the MFID field
-      for (i = 32; i < 56; i++)
+    else if (lc_format == 0x59)
-        {
-          tmpstr[j] = lcinfo[i];
-          j++;
-        }
-      tmpstr[24] = 0;
-      source = strtol (tmpstr, NULL, 2);
-      state->lastsrc = source;
-      if (opts->p25tg == 1)
-        {
-          fprintf (stderr, "src: %li emr: %c\n", source, lcinfo[0]);
-        }
-    }
-  else if ((opts->p25tg == 1) && (opts->p25lc == 1))
     {
-      fprintf (stderr, "\n");
+      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 == 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)
+      fprintf (stderr, " MFID90 (Moto) Group Regroup Channel User (LCGRGR)");
+
+    else if (lc_mfid == 0x90 && lc_opcode == 0x1)
+      fprintf (stderr, " MFID90 (Moto) Group Regroup Channel Update (LCGRGU)");
+
+    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)");
+    }
+  }
+
+  //ending line break
+  fprintf (stderr, "\n");
+
 }
+
+

src/p25p1_block.cpp

@@ -1,276 +0,0 @@
-/*-------------------------------------------------------------------------------
- * 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;
-                }
-            }
-            /* 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);
-}