version 1.4.1

Author: szechyjs

CHANGELOG

@@ -1,3 +1,44 @@
+1.4.1
+	New features:
+        Several new sync types for existing formats now recognized:
+          Decodes voice from NXDN 4800 (6.25kHz) signals
+  	  Decodes voice from NXDN 9600 (12.5kHz) repeater output
+	  Decodes voice from DMR/MotoTRBO simplex/repeater input
+	  Decodes voice from X2-TDMA simplex/repeater input
+
+	Fixed bugs:
+	renamed "input:" to "inlvl:" to reduce confusion.  This value
+	indicates the audio input level, NOT the "decode success
+	rate".  Voice decode errors are indicated by the errorbars "=".
+
+1.4
+	New features:
+	Decodes voice from NXDN 9600 (12.5 kHz) simplex/repeater input
+	NXDN96 frames enabled by default
+	Improved resistance to NXDN96 sync false positives
+
+	Fixed bugs:
+	.wav file header updated after playing .imb/.amb data files
+	.imb/.amb files now have correct tgid in filename
+
+1.3.1	New features:
+        Support for ProVoice EA sync
+	CTRL-C is now caught so .wav files can be properly closed
+	DSD now shows mbelib version as well as it's own version
+	-R resume option now triggers on any TSDU so control channels can be left
+	in conventional scanlists.
+	Auto output gain now has 0.5 second hold time for faster error burst recovery
+	(was 1.5 seconds)
+        Audio output upsampling function simplified and improved 
+
+	Fixed bugs:
+	DSD_Author.pgp now has correct public key (was copy of mbelib_Author key)
+	TGID and SRC are now cleared after TDULC or TDU.
+	Voice error counter is now reset in noCarrier()
+	TGID and SRC were not displaying for X2-TDMA frames
+	Fixed buffer issue in resumeScan()
+	Fixed error in .wav file headers preventing playback on some apps
+
 1.3	New features:
         Decodes voice from ProVoice signals (requires -fp option)
 	algid and kid are now shown in hex notation
@@ -17,7 +58,7 @@
 
 	Fixed bugs:
 	nac was showing wrong ID
-	p25 metadata (lcinfo, mfid, lfcormat, mi, keyid, algid, lsd) are now
+	P25 metadata (lcinfo, mfid, lfcormat, mi, keyid, algid, lsd) are now
 	  printed out in the correct bit order (MSB -> LSB), was reversed.
 	fixed serveral bugs in dsd_upsample.c, with improved quality
 

DSD_Author.pgp

@@ -1,30 +1,30 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 Version: GnuPG v1.4.10
 
-mQENBEufusYBCADN1SNkRkQzdLM02MCjen8KQmfuA38MrQIV0dZLpPJcn1+hsvZZ
-KWvpUiWCNw1ClGRsJAT5cjonndi1PV7tpzQz+CyMqSP5OwR40eTJBoZhl74hdmU8
-QvcKkJ32khSsOXMo60NHk5iIMDELzOGqq57NHhbunj6NtYog2mR5+WT37JLCvF/q
-dvYl2KkRwEHD76/b/O1CyheiiqNMGBb13zPN0qO/PRlENSgViLcDh9qVj4ETNNS6
-zMlP4D4pa07iED4Ua31wiXI04ReznnmvMqzQb8uFbg7d98F3bZpsbNURbmsFHMhj
-c9qw65nzaMa3OHfZ3Qwl4XRlNqEzZrclIZADABEBAAG0DW1iZWxpYiBBdXRob3KJ
-ATgEEwECACIFAkufusYCGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEE+Y
-6GPqXv4sI/4H/RsumInT5GtDdBTgxt3lERqc5GF8tI5CAQX9DUMMkKxQ306Fgb4M
-ISYdepgL6BlbtSyMdKpKsDLScNA6YXER4gMU1nhhyBulqj41kAfsVbG8hiTBy5Ri
-FTo36HrC//Zj1MlaTCB8Rl6B6IftAHIb1U+Gda3WnLDe+R5Pym/76TqeYx23PnJl
-V+qfrkjbNyOb2bttyko2iccm9DSq/I1OF0Ufz3P60ssUwHW/b2S6WOXRxiZIq0sz
-8pAweUFCxIMWo+XYlSpRtwpebfx+JoHJKdW1cSCgY9jwVsOZO1zxc8P+jr3ByiIR
-ZPd0PfBt/AHuC6Hmw9nC12e49+4qsHkj50S5AQ0ES5+6xgEIALf60WjqHm552FIX
-KqmG0TIrXpCsYoTWzDdO5j0Ro6fmg9U48BqDH5aS4YRvuyPE7q6DGYEnXF5EIPtU
-FhUk4FMmez5eMg91UW4Qjqx8M3reoBROYocM5Nfbc9w7St8+3oRS6rUBIh/B6o4O
-kEjkoW3R7O3uFpC53Oi9IVhx/joWxhi430RrUTig5CQzuPFTAHd3xJVE6Pv44nsY
-/PsOhBLu2Z3kRkvjcGbsGDlAl2bDEobzQdsqXDD8gJkF5W4IeBKvRC54SE0FSm57
-G1gadhZ7vT4DWQZvYYKXR+AE7FTcopoAFHdapYokOGLHCguabyeZ5q7+s7J4nddL
-p5yq8ikAEQEAAYkBHwQYAQIACQUCS5+6xgIbDAAKCRBPmOhj6l7+LPi6B/sEkDkm
-Qs/aTz9HDANBAbTuDZTY4WBbkPdFos3xxC2Z/TH5m4bfHEkvNk5WD+j+vYB3exAc
-uBi7ZiqibRpap4kiAiKKCRXOyvmEmrjKB5wOWbRpkdTeEdPcpsQ4dDDw1ZUKwzjN
-1jI/9GOgq49nAGdlU59f3IdPut6oQNq9vrtanTq2xHVN/rOhV9GLE6gLX1YWkpIH
-zYSUheGPsnv4sWRsQDTB7xmF+6RZzjmauKNwsGFscX1TenOWtUbYb9qFCwvNMOSk
-51sEaD6PK6wWTXMqQlgjaoGqh1ZaePgT0QTh1W/bvOD0fL5NEToJl2h/lBSvO+ez
-R9B++dt5JX9BMxAH
-=puA7
+mQENBEufuqsBCADAtWFE1qE3xqJE4xggUn6id0fVulM7y+rSH1VPxo7Ps9duc/O9
+VegEx8+N5KphDROS4RgHxMiS1O8Qy5Hpq4gEp6RvLNj3s+0DMwqRZoA0tBCkNmvF
+K7sF+GncrOu/NZkDIZ8emN9NWWeWynWJvuM2H5HQA9yCq+YTFae5sgyr3APC3xh4
+OkTuVMcclGTJdVrISlNBDpo/AZLJ/nV0SgITpiZVsI4RSNiQPP1kX+2fIDEAwtxN
+3HIDyegDoX36cOItsb05zHkLxoUoZnWoxMvV3rwnqXg5cr6PWfiwgqWd0avl1sg6
+abpR6MKV68OCpTkqMrDIXJJrM2sTz+ZB2bBtABEBAAG0CkRTRCBBdXRob3KJATgE
+EwECACIFAkufuqsCGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEPqiY10/
+HX/Q11UH/0ZutGQWLZyZD5ZqVdBeYEf6IKhKhaC2vD/+5zUJ2cIgT5xJVTPCKN7X
+sygBANJc9GyPRYRvQecdcTHR5B+wUKCPeibv9iQuU3v7Uqb5edXEh2b4jOMWNvHJ
+l3lqBdUefuQdbc2xXCPgn+GkyexXEBsVF3hCzWV9r4bCpY57iWUYZZT0wAbN81hz
+jPKCCRmF+gZUUufxyhUGq/+eAKeUll6lgG5Ms2YKOlUMphfMav45qgWZHj1DASOV
+wPsiIVUaC6+GtHTTzHYRL05ydxxduX+yyKDO1emCE4fx1n3jdwToHLRrC1ui+AJM
+Q1s+bp+bGmMYaYaKc/JtNHcN8mbWyCK5AQ0ES5+6qwEIAJvPrnv2QO5Be3FRsnYL
+qbA1h/Lj0SjnuimaiNOzCYFIYtusLpyWjwWUnOEXdw5FoExqUStOHJ557SDG/zFB
+qy+DsNC9ncSRZ5U2tUQUtt50m2lpYvoy/sVf3oN+IsyZ5hZpiAwrxlyMC/aoGR3C
+6ZlLkZ42azNCmEmoBniIxQ+XwhwkLMRsOnqLoFyXB9CcDFIXeEhZkVWZT0B5+20f
+yGSBDJ6VcIAASoaIyvSwU9l/DT7D/s0J8WnZQZmRdrsZ3Ikj0Sv/4D2MJnCVJTSw
+DHq5Sf7DmUq/WD0iWRLEXWmPt9w3WxP4imhtmIpICxCDoeQUTkqFpOTf29sVcpPt
+838AEQEAAYkBHwQYAQIACQUCS5+6qwIbDAAKCRD6omNdPx1/0O8ECADAcPORjGFl
+RnIrsgiVMp82GQ7hnZZxktU1WVVx8EsPTT1DD79nIoeKI+UcenzuOGyTX7DGcy+P
+rWntUbt2ZygPTbP5Wu6zd845y9EzjxQ5q0vDF4oAefQptwqGDVeO/KBv9cZLbnih
+VEjQELgC/rVB7nd5p83EL5vb8qL/Eiu65stxwZ3QOT9pp2bsAPk6LJWWnVqJroKI
+Pc6KWG7n6mMJPbhFmE8Ld2lcNlSKQwLHIxDocL2GAqh5S5hJeGg2oLMFpy0g2Ron
+643w0zPfpKC15TlnkJDCIgtRlHovrs42Qkypz9y3e8yOL9O0RLYIKbuKw4mNR3cT
+OdeV+TjfiZ5I
+=2oe6
 -----END PGP PUBLIC KEY BLOCK-----

Makefile

@@ -14,7 +14,7 @@
 # PERFORMANCE OF THIS SOFTWARE.
 
 CC = gcc
-CFLAGS = -O2
+CFLAGS = -O2 -Wall
 INCLUDES = -I. -I/usr/local/include -I/usr/include
 LIBS = -L/usr/local/lib -lm -lmbe 
 INSTALL=install
@@ -24,7 +24,7 @@ DEST_BASE=/usr/local
 DEST_INC=${DEST_BASE}/include
 DEST_LIB=${DEST_BASE}/lib
 DEST_BIN=${DEST_BASE}/bin
-OBJS = dsd_main.o dsd_symbol.o dsd_dibit.o dsd_frame_sync.o dsd_file.o dsd_audio.o dsd_serial.o dsd_frame.o dsd_mbe.o dsd_upsample.o p25p1_hdu.o p25p1_ldu1.o p25p1_ldu2.o p25p1_tdulc.o p25_lcw.o x2tdma_voice.o x2tdma_data.o dstar.o nxdn96.o dmr_voice.o dmr_data.o provoice.o
+OBJS = dsd_main.o dsd_symbol.o dsd_dibit.o dsd_frame_sync.o dsd_file.o dsd_audio.o dsd_serial.o dsd_frame.o dsd_mbe.o dsd_upsample.o p25p1_hdu.o p25p1_ldu1.o p25p1_ldu2.o p25p1_tdulc.o p25_lcw.o x2tdma_voice.o x2tdma_data.o dstar.o nxdn_voice.o nxdn_data.o dmr_voice.o dmr_data.o provoice.o
 
 all: dsd
 
@@ -84,8 +84,14 @@ x2tdma_data.o: x2tdma_data.c x2tdma_const.h dsd.h config.h
 dstar.o: dstar.c dstar_const.h dsd.h config.h
 	$(CC) $(CFLAGS) $(INCLUDES) -c dstar.c -o dstar.o
 
-nxdn96.o: nxdn96.c nxdn96_const.h dsd.h config.h
-	$(CC) $(CFLAGS) $(INCLUDES) -c nxdn96.c -o nxdn96.o
+nxdn48_voice.o: nxdn48_voice.c nxdn_const.h dsd.h config.h
+	$(CC) $(CFLAGS) $(INCLUDES) -c nxdn48_voice.c -o nxdn48_voice.o
+
+nxdn_voice.o: nxdn_voice.c nxdn_const.h dsd.h config.h
+	$(CC) $(CFLAGS) $(INCLUDES) -c nxdn_voice.c -o nxdn_voice.o
+
+nxdn_data.o: nxdn_data.c nxdn_const.h dsd.h config.h
+	$(CC) $(CFLAGS) $(INCLUDES) -c nxdn_data.c -o nxdn_data.o
 
 dmr_voice.o: dmr_voice.c dmr_const.h dsd.h config.h
 	$(CC) $(CFLAGS) $(INCLUDES) -c dmr_voice.c -o dmr_voice.o

README

@@ -1,4 +1,4 @@
-Digital Speech Decoder 1.3
+Digital Speech Decoder 1.4
 Copyright (C) 2010 DSD Author
 GPG Key ID: 0x3F1D7FD0 (74EF 430D F7F2 0A48 FCE6  F630 FAA2 635D 3F1D 7FD0)
 
@@ -16,10 +16,10 @@ PERFORMANCE OF THIS SOFTWARE.
 
 	DSD is able to decode several digital voice formats from discriminator
 	tap audio and synthesize  the decoded speech.  Speech 
-	synthesis requires mbelib, which is a separate package.  DSD 1.3
+	synthesis requires mbelib, which is a separate package.  DSD 1.4.1
 	requires mbelib 1.1 or later.
 
-	Supported formats in version 1.3:
+	Supported formats in version 1.4.1:
 
 	P25 Phase 1  Widely deployed radio standard used in public safety
 	             and amateur radio.
@@ -46,18 +46,17 @@ PERFORMANCE OF THIS SOFTWARE.
 	DMR/MOTOTRBO "Digital Mobile Radio" Eurpoean two slot TDMA standard.
 	             MOTOTRBO is a popular implementation of this standard.
 
-                     Support includes decoding and synthesis of speech and
-                     the ability to save and replay .amb data files.
+	             Support includes decoding and synthesis of speech and
+	             the ability to save and replay .amb data files.
 
-	Development (no speech) support only:
+        NXDN         Digital radio standard used by NEXEDGE and IDAS brands.
+	             Supports both 9600 baud (12.5 kHz) and
+	             4800 baud (6.25 kHz) digital voice.
 
-	NXDN (9600)  Digital radio standard used by NEXEDGE and IDAS brands.
+	             Support includes decoding and synthesis of speech and
+	             the ability to save and replay .amb data files.
 
-	             Development support only.  DSD recognizes frames and can
-	             extract the voice bits but speech is not yet decoded.
-	             The issue is likely either an unusual interleave pattern
-	             or a pseudo-random bit mask initialized by a "color code"
-	             Note: not enabled by default, use -fn to enable.
+	Development (no speech) support only:
 
 	D-STAR       Amateur radio digital voice standard 
 
@@ -66,9 +65,9 @@ PERFORMANCE OF THIS SOFTWARE.
 	             D-STAR likely uses a version of AMBE not yet supported by
 	             mbelib.  The voice bit interleave pattern also needs to be
 	             determined.  
-                     Note: not enabled by default, use -fn to enable.
+                     Note: not enabled by default, use -fd to enable.
 
-        Unsupported formats in version 1.3 considered for future development:
+        Unsupported formats in version 1.4 considered for future development:
 
 	P25 Phase 2  This is not yet a published standard.  Full support is
 	             expected once the standard is published and there are
@@ -78,10 +77,7 @@ PERFORMANCE OF THIS SOFTWARE.
         OpenSKY      It is possible that the four slot version uses a vocoder
                      supported by mbelib.  The two slot version does not.
 
-	NXDN (4800)  This should be supportable as soon as we have .wav files 
-	             or access to a radio programmed in this format.
-
-	Supported demodulation optimizations in version 1.3:
+	Supported demodulation optimizations in version 1.4:
 
 	C4FM         Continuous envelope 2 or 4 level FSK with relatively
 	             sharp transitions between symbols.  Used by most P25 
@@ -147,19 +143,19 @@ Display modes
 	Errorbars mode output for P25 Phase 1 looks like this:
 
 
-Sync:  -p25p1   mod: C4FM input: 39% nac:  5C2 src:        0 tg: 32464  TDULC
-Sync:  -p25p1   mod: C4FM input: 39% nac:  5C2 src:        0 tg: 32464  TDULC
-Sync:  -p25p1   mod: C4FM input: 39% nac:  5C2 src:        0 tg: 32464  TDULC
-Sync:  -p25p1   mod: C4FM input: 39% nac:  5C2 src:        0 tg: 32464  TDULC
-Sync:  -p25p1   mod: C4FM input: 38% nac:  5C2 src:        0 tg: 32464  TDU
-Sync:  -p25p1   mod: C4FM input: 38% nac:  5C2 src:        0 tg: 32464  HDU
-Sync:  -p25p1   mod: C4FM input: 42% nac:  5C2 src:        0 tg: 32464  LDU1  e:
-Sync: (-p25p1)  mod: C4FM input: 39% nac:  5C2 src:    52610 tg: 32464 (LDU2) e:
-Sync:  -p25p1   mod: C4FM input: 38% nac:  5C2 src:    52610 tg: 32464  LDU1  e:
-Sync:  -p25p1   mod: C4FM input: 39% nac:  5C2 src:    52610 tg: 32464  LDU2  e:
-Sync:  -p25p1   mod: C4FM input: 39% nac:  5C2 src:    52610 tg: 32464  LDU1  e:
-Sync:  -p25p1   mod: C4FM input: 39% nac:  5C2 src:    52610 tg: 32464  LDU2  e:
-Sync:  -p25p1   mod: C4FM input: 39% nac:  5C2 src:    52610 tg: 32464  LDU1  e:
+Sync:  -P25p1   mod: C4FM inlvl: 39% nac:  5C2 src:        0 tg: 32464  TDULC
+Sync:  -P25p1   mod: C4FM inlvl: 39% nac:  5C2 src:        0 tg: 32464  TDULC
+Sync:  -P25p1   mod: C4FM inlvl: 39% nac:  5C2 src:        0 tg: 32464  TDULC
+Sync:  -P25p1   mod: C4FM inlvl: 39% nac:  5C2 src:        0 tg: 32464  TDULC
+Sync:  -P25p1   mod: C4FM inlvl: 38% nac:  5C2 src:        0 tg: 32464  TDU
+Sync:  -P25p1   mod: C4FM inlvl: 38% nac:  5C2 src:        0 tg: 32464  HDU
+Sync:  -P25p1   mod: C4FM inlvl: 42% nac:  5C2 src:        0 tg: 32464  LDU1  e:
+Sync: (-P25p1)  mod: C4FM inlvl: 39% nac:  5C2 src:    52610 tg: 32464 (LDU2) e:
+Sync:  -P25p1   mod: C4FM inlvl: 38% nac:  5C2 src:    52610 tg: 32464  LDU1  e:
+Sync:  -P25p1   mod: C4FM inlvl: 39% nac:  5C2 src:    52610 tg: 32464  LDU2  e:
+Sync:  -P25p1   mod: C4FM inlvl: 39% nac:  5C2 src:    52610 tg: 32464  LDU1  e:
+Sync:  -P25p1   mod: C4FM inlvl: 39% nac:  5C2 src:    52610 tg: 32464  LDU2  e:
+Sync:  -P25p1   mod: C4FM inlvl: 39% nac:  5C2 src:    52610 tg: 32464  LDU1  e:
 
 	"Sync" indicates the frame type detected and whether the polarity is 
 	positive or negative.  DSD automatically detects and handles either
@@ -179,7 +175,7 @@ Sync:  -p25p1   mod: C4FM input: 39% nac:  5C2 src:    52610 tg: 32464  LDU1  e:
 
 	"mod" indicates the current demodulation optimizations.
 
-	"input" indicates the audio input level.  QPSK signals tend to appear
+	"inlvl" indicates the audio input level.  QPSK signals tend to appear
 	much "wider" than C4FM from a discriminator tap so it is important
 	to set your input gain using a QPSK signal if you plan to montir them.
 	It is not necessary nor desirable to get to 100%, in fact your sound
@@ -189,7 +185,7 @@ Sync:  -p25p1   mod: C4FM input: 39% nac:  5C2 src:    52610 tg: 32464  LDU1  e:
 
 	"nac" is the P25 Phase 1 Network Access Code.  This is a 12 bit field
 	in each P25 Phase 1 header.  It should not be confused with the 16
-	bit System ID used in non-p25 trunking control channels.
+	bit System ID used in non-P25 trunking control channels.
 
 	"src" is the radio id of the trasmitting subscriber unit.
 
@@ -207,10 +203,10 @@ Sync:  -p25p1   mod: C4FM input: 39% nac:  5C2 src:    52610 tg: 32464  LDU1  e:
 
 	Errorbars mode output for X2-TDMA looks like this:
 
-Sync:  -X2-TDMA  mod: QPSK input: 59% src:    17211 tg:   197 [SLOT0]  slot1   VOICE e:
-Sync:  -X2-TDMA  mod: QPSK input: 47% src:    17211 tg:   197 [SLOT0]  slot1   VOICE e:
-Sync:  -X2-TDMA  mod: QPSK input: 43% src:    17211 tg:   197 [SLOT0]  slot1   VOICE e:
-Sync: (-X2-TDMA) mod: QPSK input: 28% src:    17211 tg:   197 [SLOT0]  slot1   VOICE e:
+Sync:  -X2-TDMA  mod: QPSK inlvl: 59% src:    17211 tg:   197 [SLOT0]  slot1   VOICE e:
+Sync:  -X2-TDMA  mod: QPSK inlvl: 47% src:    17211 tg:   197 [SLOT0]  slot1   VOICE e:
+Sync:  -X2-TDMA  mod: QPSK inlvl: 43% src:    17211 tg:   197 [SLOT0]  slot1   VOICE e:
+Sync: (-X2-TDMA) mod: QPSK inlvl: 28% src:    17211 tg:   197 [SLOT0]  slot1   VOICE e:
 
 	DMR/MOTOTRBO display is similar except it does not yet show source
 	and talkgroup information.
@@ -303,10 +299,10 @@ Display Options
 	information displayed in Errorbars mode:
 
 	-e             Show Frame Info and errorbars (default)
-	-pe            Show p25 encryption sync bits
-	-pl            Show p25 link control bits
-	-ps            Show p25 status bits and low speed data
-	-pt            Show p25 talkgroup info
+	-pe            Show P25 encryption sync bits
+	-pl            Show P25 link control bits
+	-ps            Show P25 status bits and low speed data
+	-pt            Show P25 talkgroup info
 	-q             Don't show Frame Info/errorbars
 	-s             Datascope (disables other display options)
 	-t             Show symbol timing during sync
@@ -439,7 +435,8 @@ Scanner control options:
 
 	-B <num>       Serial port baud rate (default=115200)
 	-C <device>    Serial port for scanner control (default=/dev/ttyUSB0)
-	-R <num>       Resume scan after <num> TDULC frames or any PDU
+	-R <num>      Resume scan after <num> TDULC frames or any PDU or TSDU
+
 
 	On some P25 systems Packet Data Units (PDU) are sent on the same
 	frequencies used for voice traffic.  If done constantly this can
@@ -453,7 +450,8 @@ Decoder options
 	-fa           Auto-detect frame type (default)
 	-f1           Decode only P25 Phase 1
 	-fd           Decode only D-STAR* (no audio)
-	-fn           Decode only NXDN96* (no audio)
+	-fi           Decode only NXDN48* (6.25 kHz) / IDAS*
+	-fn           Decode only NXDN96 (12.5 kHz)
 	-fp           Decode only ProVoice*
 	-fr           Decode only DMR/MOTOTRBO
 	-fx           Decode only X2-TDMA
@@ -465,10 +463,13 @@ Decoder options
 	-xx           Expect non-inverted X2-TDMA signal
 	-xr           Expect inverted DMR/MOTOTRBO signal
 
+	* denotes frame types that cannot be auto-detected.
 
-	NXDN and D-STAR are not enabled by default as they are for development
-	testing only and have shorter frame sync patterns that are prone to
-	false triggering.
+	ProVoice and NXDN48 not auto-detected as use different symbol
+	rates (9600 and 2400) than most formats (4800).  D-STAR is not
+	enabled by default as voice decode does not work and it has a
+        short sync word that is prone to false triggering.  It is included
+	for development/testing only.  
 
 	MBE speech synthesis is broken down into two main types of sounds,
 	"Voiced" and "Unvoiced".  Voiced speech bands are synthesized with

configure

@@ -206,7 +206,7 @@ processDMRdata (dsd_opts * opts, dsd_state * state)
   printf ("%s ", syncbits);
 #endif
 
-  if (strcmp (sync, DMR_DATA_SYNC) == 0)
+  if ((strcmp (sync, DMR_BS_DATA_SYNC) == 0) || (strcmp (sync, DMR_MS_DATA_SYNC) == 0))
     {
       if (state->currentslot == 0)
         {
@@ -217,17 +217,6 @@ processDMRdata (dsd_opts * opts, dsd_state * state)
           sprintf (state->slot1light, "[slot1]");
         }
     }
-  else if (strcmp (sync, DMR_VOICE_SYNC) == 0)
-    {
-      if (state->currentslot == 0)
-        {
-          sprintf (state->slot0light, "[SLOT0]");
-        }
-      else
-        {
-          sprintf (state->slot1light, "[SLOT1]");
-        }
-    }
 
   if (opts->errorbars == 1)
     {