diff options
author | Tom Rondeau <tom@trondeau.com> | 2014-07-07 12:18:00 -0400 |
---|---|---|
committer | Tom Rondeau <tom@trondeau.com> | 2014-07-07 12:18:00 -0400 |
commit | 597b93798a804cde1783d6d2ab53b348d57c44cd (patch) | |
tree | b65e73bb0de634ff5d209b15971ebdabf369a45c /gr-fec | |
parent | 1151e5502ccd440ebd89599cf7e4be4fb5ed8334 (diff) |
Removing trailing/extra whitespaces before release.
We should be more careful about letting these into the code in the future. In emacs, we can use (add-hook 'before-save-hook 'delete-trailing-whitespace).
Diffstat (limited to 'gr-fec')
-rw-r--r-- | gr-fec/doc/CMakeLists.txt | 8 | ||||
-rw-r--r-- | gr-fec/doc/README.fec | 2 | ||||
-rw-r--r-- | gr-fec/include/gnuradio/fec/CMakeLists.txt | 2 | ||||
-rw-r--r-- | gr-fec/include/gnuradio/fec/decode_ccsds_27_fb.h | 4 | ||||
-rw-r--r-- | gr-fec/include/gnuradio/fec/encode_ccsds_27_bb.h | 4 | ||||
-rw-r--r-- | gr-fec/lib/decode_ccsds_27_fb_impl.cc | 12 | ||||
-rw-r--r-- | gr-fec/lib/decode_ccsds_27_fb_impl.h | 2 |
7 files changed, 17 insertions, 17 deletions
diff --git a/gr-fec/doc/CMakeLists.txt b/gr-fec/doc/CMakeLists.txt index 776f1e2159..35aebb2e01 100644 --- a/gr-fec/doc/CMakeLists.txt +++ b/gr-fec/doc/CMakeLists.txt @@ -1,17 +1,17 @@ # Copyright 2012 Free Software Foundation, Inc. -# +# # This file is part of GNU Radio -# +# # GNU Radio is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3, or (at your option) # any later version. -# +# # GNU Radio is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with GNU Radio; see the file COPYING. If not, write to # the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-fec/doc/README.fec b/gr-fec/doc/README.fec index 02374bca84..346cc8f1da 100644 --- a/gr-fec/doc/README.fec +++ b/gr-fec/doc/README.fec @@ -7,6 +7,6 @@ imported as: See the Doxygen documentation for details about the blocks available in this package. A quick listing of the details can be found in Python -after importing by using: +after importing by using: help(fec) diff --git a/gr-fec/include/gnuradio/fec/CMakeLists.txt b/gr-fec/include/gnuradio/fec/CMakeLists.txt index 7ab0498000..a669517b3e 100644 --- a/gr-fec/include/gnuradio/fec/CMakeLists.txt +++ b/gr-fec/include/gnuradio/fec/CMakeLists.txt @@ -47,7 +47,7 @@ macro(expand_h root) string(REGEX REPLACE "X+" ${sig} name ${root}) list(APPEND expanded_files_h ${CMAKE_CURRENT_BINARY_DIR}/${name}.h) endforeach(sig) - + #create a command to generate the files add_custom_command( OUTPUT ${expanded_files_h} diff --git a/gr-fec/include/gnuradio/fec/decode_ccsds_27_fb.h b/gr-fec/include/gnuradio/fec/decode_ccsds_27_fb.h index c0c4efa2d0..99ed154c81 100644 --- a/gr-fec/include/gnuradio/fec/decode_ccsds_27_fb.h +++ b/gr-fec/include/gnuradio/fec/decode_ccsds_27_fb.h @@ -48,11 +48,11 @@ namespace gr { * The first 32 bits out will be zeroes, with the output delayed four bytes * from the corresponding inputs. */ - + class FEC_API decode_ccsds_27_fb : virtual public sync_decimator { public: - + // gr::fec::decode_ccsds_27_fb::sptr typedef boost::shared_ptr<decode_ccsds_27_fb> sptr; diff --git a/gr-fec/include/gnuradio/fec/encode_ccsds_27_bb.h b/gr-fec/include/gnuradio/fec/encode_ccsds_27_bb.h index d920b60983..e1772cd2fe 100644 --- a/gr-fec/include/gnuradio/fec/encode_ccsds_27_bb.h +++ b/gr-fec/include/gnuradio/fec/encode_ccsds_27_bb.h @@ -45,11 +45,11 @@ namespace gr { * This block is designed for continuous data streaming, not packetized data. * There is no provision to "flush" the encoder. */ - + class FEC_API encode_ccsds_27_bb : virtual public sync_interpolator { public: - + // gr::fec::encode_ccsds_27_bb::sptr typedef boost::shared_ptr<encode_ccsds_27_bb> sptr; diff --git a/gr-fec/lib/decode_ccsds_27_fb_impl.cc b/gr-fec/lib/decode_ccsds_27_fb_impl.cc index 014297caef..1058e67296 100644 --- a/gr-fec/lib/decode_ccsds_27_fb_impl.cc +++ b/gr-fec/lib/decode_ccsds_27_fb_impl.cc @@ -44,7 +44,7 @@ namespace gr { float RATE = 0.5; float ebn0 = 12.0; float esn0 = RATE*pow(10.0, ebn0/10.0); - + gen_met(d_mettab, 100, esn0, 0.0, 256); viterbi_chunks_init(d_state0); viterbi_chunks_init(d_state1); @@ -57,7 +57,7 @@ namespace gr { { const float *in = (const float *)input_items[0]; unsigned char *out = (unsigned char *)output_items[0]; - + for (int i = 0; i < noutput_items*16; i++) { // Translate and clip [-1.0..1.0] to [28..228] float sample = in[i]*100.0+128.0; @@ -66,12 +66,12 @@ namespace gr { else if (sample < 0.0) sample = 0.0; unsigned char sym = (unsigned char)(floor(sample)); - + d_viterbi_in[d_count % 4] = sym; if ((d_count % 4) == 3) { // Every fourth symbol, perform butterfly operation viterbi_butterfly2(d_viterbi_in, d_mettab, d_state0, d_state1); - + // Every sixteenth symbol, read out a byte if (d_count % 16 == 11) { // long metric = @@ -79,10 +79,10 @@ namespace gr { // printf("%li\n", *(out-1), metric); } } - + d_count++; } - + return noutput_items; } diff --git a/gr-fec/lib/decode_ccsds_27_fb_impl.h b/gr-fec/lib/decode_ccsds_27_fb_impl.h index cd16c6ab1c..83fed604d4 100644 --- a/gr-fec/lib/decode_ccsds_27_fb_impl.h +++ b/gr-fec/lib/decode_ccsds_27_fb_impl.h @@ -40,7 +40,7 @@ namespace gr { struct viterbi_state d_state0[64]; struct viterbi_state d_state1[64]; unsigned char d_viterbi_in[16]; - + int d_count; public: |