Changeset 4015 for SigProc/trunk/SigProc/SigProc.h

Timestamp:

05/30/07 12:45:15 (6 years ago)

Author:

jgaeddert

Message:

Adding modulator functions to SigProc?

Files:

• SigProc/trunk/SigProc/SigProc.h (modified) (1 diff)

SigProc/trunk/SigProc/SigProc.h

@@ -713 +713 @@
 
 
-#define MOD_BPSK_LEVEL 10000    ///< BPSK amplitude (RMS=10000)
-
-#define MOD_QPSK_LEVEL 7071     ///< QPSK amplitude (RMS=10000)
-
-#define MOD_PSK8_LEVEL_1 7071   ///< Low 8-PSK amplitude (RMS=10000)
-#define MOD_PSK8_LEVEL_2 10000  ///< High 8-PSK amplitude (RMS=10000)
-
-#define MOD_QAM16_LEVEL_1 3162  ///< Low 16-QAM amplitude (RMS=10000)
-#define MOD_QAM16_LEVEL_2 9487  ///< High 16-QAM amplitude (RMS=10000)
-
-#define MOD_PAM4_LEVEL_1 4472   ///< Low 4-PAM amplitude (RMS=10000)
-#define MOD_PAM4_LEVEL_2 13416  ///< High 4-PAM amplitude (RMS=10000)
+const short BPSK_LEVEL(10000);      ///< BPSK amplitude (RMS=10000)
+
+const short QPSK_LEVEL(7071);       ///< QPSK amplitude (RMS=10000)
+
+const short PSK8_LEVEL_1(7071);     ///< Low 8-PSK amplitude (RMS=10000)
+const short PSK8_LEVEL_2(10000);    ///< High 8-PSK amplitude (RMS=10000)
+
+const short QAM16_LEVEL_1(3162);    ///< Low 16-QAM amplitude (RMS=10000)
+const short QAM16_LEVEL_2(9487);    ///< High 16-QAM amplitude (RMS=10000)
+
+const short PAM4_LEVEL_1(4472);     ///< Low 4-PAM amplitude (RMS=10000)
+const short PAM4_LEVEL_2(13416);    ///< High 4-PAM amplitude (RMS=10000)
 
 ///
-void ModulateBPSK(char * bits_in, unsigned int N_in, short * I_out, short * Q_out);
+void ModulateBPSK(short symbol, short &I_out, short &Q_out);
 
 ///
-void ModulateQPSK(char * bits_in, unsigned int N_in, short * I_out, short * Q_out);
+void ModulateQPSK(short symbol, short &I_out, short &Q_out);
 
 ///
-void Modulate8PSK(char * bits_in, unsigned int N_in, short * I_out, short * Q_out);
+void Modulate8PSK(short symbol, short &I_out, short &Q_out);
 
 ///
-void Modulate16QAM(char * bits_in, unsigned int N_in, short * I_out, short * Q_out);
+void Modulate16QAM(short symbol, short &I_out, short &Q_out);
 
 ///
-void Modulate4PAM(char * bits_in, unsigned int N_in, short * I_out, short * Q_out);
+void Modulate4PAM(short symbol, short &I_out, short &Q_out);
 
 }