[Commit-gnuradio] r5990 - gnuradio/branches/developers/trondeau/ofdm_mod/gnuradio-core/src/lib/general

[trondeau]

Author: trondeau
Date: 2007-07-16 14:23:13 -0600 (Mon, 16 Jul 2007)
New Revision: 5990

Modified:
   
gnuradio/branches/developers/trondeau/ofdm_mod/gnuradio-core/src/lib/general/gr_ofdm_bpsk_mapper.cc
   
gnuradio/branches/developers/trondeau/ofdm_mod/gnuradio-core/src/lib/general/gr_ofdm_frame_sink.cc
   
gnuradio/branches/developers/trondeau/ofdm_mod/gnuradio-core/src/lib/general/gr_ofdm_qpsk_mapper.cc
Log:
reworked constellation representation to match gr_ofdm_mapper_bcv 
representation in both demodulator and modulators (for consistency while they 
exist).

Modified: 
gnuradio/branches/developers/trondeau/ofdm_mod/gnuradio-core/src/lib/general/gr_ofdm_bpsk_mapper.cc
===================================================================
--- 
gnuradio/branches/developers/trondeau/ofdm_mod/gnuradio-core/src/lib/general/gr_ofdm_bpsk_mapper.cc
 2007-07-16 19:43:13 UTC (rev 5989)
+++ 
gnuradio/branches/developers/trondeau/ofdm_mod/gnuradio-core/src/lib/general/gr_ofdm_bpsk_mapper.cc
 2007-07-16 20:23:13 UTC (rev 5990)
@@ -59,7 +59,7 @@
 randombit()
 {
   int r = rand()&1;
-  return (float)(-1 + 2*r);
+  return (float)(1 - 2*r);
 }
 
 int
@@ -105,7 +105,7 @@
   i = 0;
   while((d_msg_offset < d_msg->length()) && (i < d_occupied_carriers)) {
     unsigned char bit = (d_msg->msg()[d_msg_offset] >> (d_bit_offset)) & 0x01;
-    out[i + zeros_on_left] = gr_complex(-1+2*(bit));
+    out[i + zeros_on_left] = gr_complex(1-2*(bit));
     i++;
     d_bit_offset++;
     if(d_bit_offset == 8) {

Modified: 
gnuradio/branches/developers/trondeau/ofdm_mod/gnuradio-core/src/lib/general/gr_ofdm_frame_sink.cc
===================================================================
--- 
gnuradio/branches/developers/trondeau/ofdm_mod/gnuradio-core/src/lib/general/gr_ofdm_frame_sink.cc
  2007-07-16 19:43:13 UTC (rev 5989)
+++ 
gnuradio/branches/developers/trondeau/ofdm_mod/gnuradio-core/src/lib/general/gr_ofdm_frame_sink.cc
  2007-07-16 20:23:13 UTC (rev 5990)
@@ -76,13 +76,13 @@
 
 unsigned char gr_ofdm_frame_sink::bpsk_slicer(gr_complex x)
 {
-  return (unsigned char)(x.real() > 0 ? 1 : 0);
+  return (unsigned char)(x.real() > 0 ? 0 : 1);
 }
 
 unsigned char gr_ofdm_frame_sink::qpsk_slicer(gr_complex x)
 {
-  unsigned char i = (x.real() > 0 ? 1 : 0);
-  unsigned char q = (x.imag() > 0 ? 1 : 0);
+  unsigned char i = (x.real() > 0 ? 0 : 1);
+  unsigned char q = (x.imag() > 0 ? 0 : 1);
 
   return (q << 1) | i;
 }

Modified: 
gnuradio/branches/developers/trondeau/ofdm_mod/gnuradio-core/src/lib/general/gr_ofdm_qpsk_mapper.cc
===================================================================
--- 
gnuradio/branches/developers/trondeau/ofdm_mod/gnuradio-core/src/lib/general/gr_ofdm_qpsk_mapper.cc
 2007-07-16 19:43:13 UTC (rev 5989)
+++ 
gnuradio/branches/developers/trondeau/ofdm_mod/gnuradio-core/src/lib/general/gr_ofdm_qpsk_mapper.cc
 2007-07-16 20:23:13 UTC (rev 5990)
@@ -60,7 +60,7 @@
 {
   int r1 = rand()&1;
   int r2 = rand()&1;
-  return gr_complex((0.707)*(-1 + 2*r1),(0.707)*(-1 + 2*r2));
+  return gr_complex((0.707)*(1 - 2*r1),(0.707)*(1 - 2*r2));
 }
 
 int
@@ -111,7 +111,7 @@
     unsigned char bit1 = (d_msg->msg()[d_msg_offset] >> (d_bit_offset)) & 0x01;
     d_bit_offset++;
     
-    out[i + zeros_on_left] = gr_complex((0.707)*(-1+2*(bit0)), 
(0.707)*(-1+2*(bit1)) );
+    out[i + zeros_on_left] = gr_complex((0.707)*(1-2*(bit0)), 
(0.707)*(1-2*(bit1)) );
     i++;
     if(d_bit_offset == 8) {
       d_bit_offset = 0;