diff options
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | gr-digital/lib/correlate_access_code_bb_impl.cc | 7 | ||||
| -rw-r--r-- | gr-fec/lib/cc_encoder_impl.cc | 4 | ||||
| -rw-r--r-- | gr-fft/python/fft/logpwrfft.py | 4 | ||||
| -rwxr-xr-x | gr-qtgui/python/qtgui/range.py | 2 |
5 files changed, 9 insertions, 16 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index de86d8a002..4de54d674a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -223,16 +223,16 @@ IF(MSVC) IF(MSVC90) #Visual Studio 9 SET(cmake_c_compiler_version "Microsoft Visual Studio 9.0") SET(cmake_cxx_compiler_version "Microsoft Visual Studio 9.0") - ELSE(MSVC10) #Visual Studio 10 + ELSEIF(MSVC10) #Visual Studio 10 SET(cmake_c_compiler_version "Microsoft Visual Studio 10.0") SET(cmake_cxx_compiler_version "Microsoft Visual Studio 10.0") - ELSE(MSVC11) #Visual Studio 11 + ELSEIF(MSVC11) #Visual Studio 11 SET(cmake_c_compiler_version "Microsoft Visual Studio 11.0") SET(cmake_cxx_compiler_version "Microsoft Visual Studio 11.0") - ELSE(MSVC12) #Visual Studio 12 + ELSEIF(MSVC12) #Visual Studio 12 SET(cmake_c_compiler_version "Microsoft Visual Studio 12.0") SET(cmake_cxx_compiler_version "Microsoft Visual Studio 12.0") - ELSE(MSVC14) #Visual Studio 14 + ELSEIF(MSVC14) #Visual Studio 14 SET(cmake_c_compiler_version "Microsoft Visual Studio 14.0") SET(cmake_cxx_compiler_version "Microsoft Visual Studio 14.0") ENDIF() diff --git a/gr-digital/lib/correlate_access_code_bb_impl.cc b/gr-digital/lib/correlate_access_code_bb_impl.cc index a01eb6a2b5..c547937c2a 100644 --- a/gr-digital/lib/correlate_access_code_bb_impl.cc +++ b/gr-digital/lib/correlate_access_code_bb_impl.cc @@ -109,13 +109,6 @@ namespace gr { // test for access code with up to threshold errors new_flag = (nwrong <= d_threshold); - if(new_flag) { - GR_LOG_DEBUG(d_logger, boost::format("access code found: %llx") % d_access_code); - } - else { - GR_LOG_DEBUG(d_logger, boost::format("%llx ==> %llx") % d_access_code % d_data_reg); - } - // shift in new data and new flag d_data_reg = (d_data_reg << 1) | (in[i] & 0x1); d_flag_reg = (d_flag_reg << 1); diff --git a/gr-fec/lib/cc_encoder_impl.cc b/gr-fec/lib/cc_encoder_impl.cc index 75d7dcd66b..9585d5fcd5 100644 --- a/gr-fec/lib/cc_encoder_impl.cc +++ b/gr-fec/lib/cc_encoder_impl.cc @@ -179,7 +179,7 @@ namespace gr { for(unsigned int i = 0; i < d_frame_size; ++i) { my_state = (my_state << 1) | (in[i] & 1); for(unsigned int j = 0; j < d_rate; ++j) { - out[i * d_rate + j] = parity(my_state & d_polys[j]) == 0 ? 0 : 1; + out[i * d_rate + j] = (d_polys[j] < 0) ^ parity(my_state & abs(d_polys[j])) ? 1 : 0; } } @@ -187,7 +187,7 @@ namespace gr { for(unsigned int i = 0; i < d_k - 1; ++i) { my_state = (my_state << 1) | ((d_start_state >> (d_k - 2 - i)) & 1); for(unsigned int j = 0; j < d_rate; ++j) { - out[(i + d_frame_size) * d_rate + j] = parity(my_state & d_polys[j]) == 0 ? 0 : 1; + out[(i + d_frame_size) * d_rate + j] = (d_polys[j] < 0) ^ parity(my_state & abs(d_polys[j])) ? 1 : 0; } } } diff --git a/gr-fft/python/fft/logpwrfft.py b/gr-fft/python/fft/logpwrfft.py index 356ec1217b..1ed9d6cacb 100644 --- a/gr-fft/python/fft/logpwrfft.py +++ b/gr-fft/python/fft/logpwrfft.py @@ -69,8 +69,8 @@ class _logpwrfft_base(gr.hier_block2): self._avg = filter.single_pole_iir_filter_ff(1.0, fft_size) self._log = blocks.nlog10_ff(10, fft_size, -20*math.log10(fft_size) # Adjust for number of bins - -10*math.log10(window_power/fft_size) # Adjust for windowing loss - -20*math.log10(ref_scale/2)) # Adjust for reference scale + -10*math.log10(float(window_power)/fft_size) # Adjust for windowing loss + -20*math.log10(float(ref_scale)/2)) # Adjust for reference scale self.connect(self, self._sd, fft, c2magsq, self._avg, self._log, self) self._average = average diff --git a/gr-qtgui/python/qtgui/range.py b/gr-qtgui/python/qtgui/range.py index ca42bf71f7..f60d6919bf 100755 --- a/gr-qtgui/python/qtgui/range.py +++ b/gr-qtgui/python/qtgui/range.py @@ -182,11 +182,11 @@ class RangeWidget(QtGui.QWidget): self.rangeType = rangeType # Setup the counter + self.setDecimals(ranges.precision) self.setRange(ranges.min, ranges.max) self.setValue(ranges.default) self.setSingleStep(ranges.step) self.setKeyboardTracking(False) - self.setDecimals(ranges.precision) # The counter already handles floats and can be connected directly. self.valueChanged.connect(self.changed) |