Add USRP2YSF

hb9tob · Jan 16, 2022 · 2693c9b · 2693c9b
1 parent 3bfe707
commit 2693c9b
Show file tree

Hide file tree

Showing 56 changed files with 7,099 additions and 3,561 deletions.
diff --git a/DSTAR2YSF/DSTAR2YSF b/DSTAR2YSF/DSTAR2YSF
diff --git a/M172YSF/MBEVocoder.cpp b/M172YSF/MBEVocoder.cpp
@@ -27,9 +27,6 @@ const uint8_t  BIT_MASK_TABLE8[]  = { 0x80U, 0x40U, 0x20U, 0x10U, 0x08U, 0x04U,
 
 MBEVocoder::MBEVocoder(void)
 {
-	m_mbeenc = new MBEEncoder();
-	m_mbeenc->set_dmr_mode();
-	m_mbeenc->set_gain_adjust(2.5);
 	md380_init();
 }
 
@@ -42,8 +39,3 @@ void MBEVocoder::encode_2450(int16_t *pcm, uint8_t *ambe49)
 {
 	md380_encode(ambe49, pcm);
 }
-
-void MBEVocoder::encode_dmr(int16_t *pcm, uint8_t *ambe)
-{
-	m_mbeenc->encode(pcm, ambe);
-}
diff --git a/M172YSF/MBEVocoder.h b/M172YSF/MBEVocoder.h
@@ -21,19 +21,14 @@
 #ifndef INCLUDED_AMBE_ENCODER_H
 #define INCLUDED_AMBE_ENCODER_H
 
-#include "mbeenc.h"
 #include <stdint.h>
 
 
 class MBEVocoder {
 public:
 	void decode_2450(int16_t *, uint8_t *);
 	void encode_2450(int16_t *, uint8_t *);
-	void encode_dmr(int16_t *, uint8_t *);
 	MBEVocoder(void);
-
-private:
-	MBEEncoder *m_mbeenc;
 };
 
 #endif /* INCLUDED_AMBE_ENCODER_H */
diff --git a/M172YSF/Makefile b/M172YSF/Makefile
@@ -4,8 +4,7 @@ CFLAGS  ?= -g -O3 -Wall -std=c++0x
 LIBS    = -lm -lmd380_vocoder -lmbe -limbe_vocoder
 LDFLAGS ?= -g
 
-OBJECTS = 	Conf.o CRC.o M17Network.o Golay24128.o Log.o mbeenc.o ambe.o \
-			MBEVocoder.o ModeConv.o Mutex.o StopWatch.o Timer.o UDPSocket.o Utils.o YSFConvolution.o YSFFICH.o YSFNetwork.o YSFPayload.o \
+OBJECTS = 	Conf.o CRC.o M17Network.o Golay24128.o Log.o MBEVocoder.o ModeConv.o Mutex.o StopWatch.o Timer.o UDPSocket.o Utils.o YSFConvolution.o YSFFICH.o YSFNetwork.o YSFPayload.o \
 			codec2/codebooks.o codec2/kiss_fft.o codec2/lpc.o codec2/nlp.o codec2/pack.o codec2/qbase.o codec2/quantise.o codec2/codec2.o M172YSF.o 
 
 all:		M172YSF