diff options
198 files changed, 289 insertions, 289 deletions
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index b1b118bb33..11831cca8b 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -25,7 +25,7 @@ release and the incorporated maintenance release: * Darek Kawamoto <darek@he360.com> * Ethan Trewhitt <ethan.trewhitt@gtri.gatech.edu> * Geof Gnieboer <gnieboer@corpcomm.net> -* Hatsune Aru <email witheld> +* Hatsune Aru <email withheld> * Jacob Gilbert <mrjacobagilbert@gmail.com> * Jiřà Pinkava <j-pi@seznam.cz> * Johannes Demel <demel@ant.uni-bremen.de> @@ -56,7 +56,7 @@ release and the incorporated maintenance release: * Sylvain Munaut <tnt@246tNt.com> * Thomas Habets <habets@google.com> * Tim O'Shea <tim.oshea753@gmail.com> -* Tobias Blomberg <email witheld> +* Tobias Blomberg <email withheld> Changes diff --git a/cmake/Modules/CMakeParseArgumentsCopy.cmake b/cmake/Modules/CMakeParseArgumentsCopy.cmake index 7ce4c49ae5..66016cb2ff 100644 --- a/cmake/Modules/CMakeParseArgumentsCopy.cmake +++ b/cmake/Modules/CMakeParseArgumentsCopy.cmake @@ -58,7 +58,7 @@ # the new option. # E.g. my_install(TARGETS foo DESTINATION OPTIONAL) would result in # MY_INSTALL_DESTINATION set to "OPTIONAL", but MY_INSTALL_DESTINATION would -# be empty and MY_INSTALL_OPTIONAL would be set to TRUE therefor. +# be empty and MY_INSTALL_OPTIONAL would be set to TRUE therefore. #============================================================================= # Copyright 2010 Alexander Neundorf <neundorf@kde.org> diff --git a/cmake/Modules/GrBuildTypes.cmake b/cmake/Modules/GrBuildTypes.cmake index 5789d88934..15b7339136 100644 --- a/cmake/Modules/GrBuildTypes.cmake +++ b/cmake/Modules/GrBuildTypes.cmake @@ -29,7 +29,7 @@ set(__INCLUDED_GR_BUILD_TYPES_CMAKE TRUE) # - RelWithDebInfo: -O3 -g # - MinSizeRel: -Os -# Addtional Build Types, defined below: +# Additional Build Types, defined below: # - NoOptWithASM: -O0 -g -save-temps # - O2WithASM: -O2 -g -save-temps # - O3WithASM: -O3 -g -save-temps diff --git a/cmake/Modules/GrMiscUtils.cmake b/cmake/Modules/GrMiscUtils.cmake index 188c40480b..94c619c2ea 100644 --- a/cmake/Modules/GrMiscUtils.cmake +++ b/cmake/Modules/GrMiscUtils.cmake @@ -190,7 +190,7 @@ endfunction(GR_LIBRARY_FOO) # GR_GEN_TARGET_DEPS(unique_name target_deps <target1> <target2> ...) # ADD_CUSTOM_COMMAND(<the usual args> ${target_deps}) # -# Custom command cant depend on targets, but can depend on executables, +# Custom command can't depend on targets, but can depend on executables, # and executables can depend on targets. So this is the process: ######################################################################## function(GR_GEN_TARGET_DEPS name var) @@ -209,7 +209,7 @@ function(GR_GEN_TARGET_DEPS name var) endif(ARGN) if(CMAKE_CROSSCOMPILING) - set(${var} "DEPENDS;${name}" PARENT_SCOPE) #cant call command when cross + set(${var} "DEPENDS;${name}" PARENT_SCOPE) #can't call command when cross else() set(${var} "DEPENDS;${name};COMMAND;${name}" PARENT_SCOPE) endif() diff --git a/cmake/Modules/GrSwig.cmake b/cmake/Modules/GrSwig.cmake index 0530dad80d..9fb61e2c89 100644 --- a/cmake/Modules/GrSwig.cmake +++ b/cmake/Modules/GrSwig.cmake @@ -35,7 +35,7 @@ include(GrPython) function(GR_SWIG_MAKE_DOCS output_file) if(ENABLE_DOXYGEN) - #setup the input files variable list, quote formated + #setup the input files variable list, quote formatted set(input_files) unset(INPUT_PATHS) foreach(input_path ${ARGN}) @@ -261,7 +261,7 @@ def get_swig_deps(file_path, level): inc_path = os.path.join(inc_dir, inc_file) if not os.path.exists(inc_path): continue deps.extend(get_swig_deps(inc_path, level-1)) - break #found, we dont search in lower prio inc dirs + break #found, we don't search in lower prio inc dirs return deps if __name__ == '__main__': diff --git a/cmake/msvc/sys/time.h b/cmake/msvc/sys/time.h index 12acc8dc31..dca0fdf51b 100644 --- a/cmake/msvc/sys/time.h +++ b/cmake/msvc/sys/time.h @@ -7,7 +7,7 @@ //http://social.msdn.microsoft.com/Forums/en/vcgeneral/thread/430449b3-f6dd-4e18-84de-eebd26a8d668 #include < time.h > -#include <windows.h> //I've ommited this line. +#include <windows.h> //I've omitted this line. #if defined(_MSC_VER) || defined(_MSC_EXTENSIONS) #define DELTA_EPOCH_IN_MICROSECS 11644473600000000Ui64 #else diff --git a/docs/RELEASE-NOTES-3.7.10.2.md b/docs/RELEASE-NOTES-3.7.10.2.md index ff5638df31..77dee32975 100644 --- a/docs/RELEASE-NOTES-3.7.10.2.md +++ b/docs/RELEASE-NOTES-3.7.10.2.md @@ -21,7 +21,7 @@ release: * Darek Kawamoto <darek@he360.com> * Ethan Trewhitt <ethan.trewhitt@gtri.gatech.edu> * Geof Nieboer <gnieboer@corpcomm.net> -* Hatsune Aru <email witheld> +* Hatsune Aru <email withheld> * Jacob Gilbert <mrjacobagilbert@gmail.com> * Jiřà Pinkava <j-pi@seznam.cz> * Johannes Demel <demel@ant.uni-bremen.de> @@ -47,7 +47,7 @@ release: * Sylvain Munaut <tnt@246tNt.com> * Thomas Habets <habets@google.com> * Tim O'Shea <tim.oshea753@gmail.com> -* Tobias Blomberg <email witheld> +* Tobias Blomberg <email withheld> Bug Fixes diff --git a/docs/RELEASE-NOTES-3.7.11.md b/docs/RELEASE-NOTES-3.7.11.md index b1b118bb33..11831cca8b 100644 --- a/docs/RELEASE-NOTES-3.7.11.md +++ b/docs/RELEASE-NOTES-3.7.11.md @@ -25,7 +25,7 @@ release and the incorporated maintenance release: * Darek Kawamoto <darek@he360.com> * Ethan Trewhitt <ethan.trewhitt@gtri.gatech.edu> * Geof Gnieboer <gnieboer@corpcomm.net> -* Hatsune Aru <email witheld> +* Hatsune Aru <email withheld> * Jacob Gilbert <mrjacobagilbert@gmail.com> * Jiřà Pinkava <j-pi@seznam.cz> * Johannes Demel <demel@ant.uni-bremen.de> @@ -56,7 +56,7 @@ release and the incorporated maintenance release: * Sylvain Munaut <tnt@246tNt.com> * Thomas Habets <habets@google.com> * Tim O'Shea <tim.oshea753@gmail.com> -* Tobias Blomberg <email witheld> +* Tobias Blomberg <email withheld> Changes diff --git a/docs/RELEASE-NOTES-3.7.9.1.md b/docs/RELEASE-NOTES-3.7.9.1.md index 0d1dca9f67..e3433cf771 100644 --- a/docs/RELEASE-NOTES-3.7.9.1.md +++ b/docs/RELEASE-NOTES-3.7.9.1.md @@ -63,8 +63,8 @@ where blocks (such as the delay block) would drop tags. Paul David stepped in with his first contribution to GNU Radio with a fix. Fix an issue with flat\_flowgraph calculating alignment by -misinterpreting units of write and read indeces. This was only apparent when these -indeces are non-zero (a flowgraph has stopped and restarted). +misinterpreting units of write and read indices. This was only apparent when these +indices are non-zero (a flowgraph has stopped and restarted). Fix exceptions thrown in hier\_block2 constructors. @@ -102,7 +102,7 @@ Maximum Deviation parameter for NBFM transmitter exposed to GRC ### gr-digital Change the constellation receiver to inherit from control\_loop -publically +publicly rather than the impl to better support the control port interface. (closed issue \#876) diff --git a/docs/RELEASE-NOTES-3.7.9.3.md b/docs/RELEASE-NOTES-3.7.9.3.md index f092bcf666..2867fe9397 100644 --- a/docs/RELEASE-NOTES-3.7.9.3.md +++ b/docs/RELEASE-NOTES-3.7.9.3.md @@ -75,7 +75,7 @@ Bug fixes * gr-uhd: Fixed timing of set_sample_rate call during initialization (Marcus Mueller) -* gr-zmq: Accomodate gcc 6.x changes to casting requirements (Philip +* gr-zmq: Accommodate gcc 6.x changes to casting requirements (Philip Balister) Numerous MSVC/mingw incompatibilities that have crept in the last few diff --git a/docs/doxygen/Doxyfile.in b/docs/doxygen/Doxyfile.in index 8d06249abb..fe350d7a9d 100644 --- a/docs/doxygen/Doxyfile.in +++ b/docs/doxygen/Doxyfile.in @@ -1080,7 +1080,7 @@ HTML_STYLESHEET = # user-defined cascading style sheet that is included after the standard # style sheets created by doxygen. Using this option one can overrule # certain style aspects. This is preferred over using HTML_STYLESHEET -# since it does not replace the standard style sheet and is therefor more +# since it does not replace the standard style sheet and is therefore more # robust against future updates. Doxygen will copy the style sheet file to # the output directory. diff --git a/docs/doxygen/Doxyfile.swig_doc.in b/docs/doxygen/Doxyfile.swig_doc.in index 63bd51de42..48e01f5cd2 100644 --- a/docs/doxygen/Doxyfile.swig_doc.in +++ b/docs/doxygen/Doxyfile.swig_doc.in @@ -913,7 +913,7 @@ HTML_STYLESHEET = # user-defined cascading style sheet that is included after the standard # style sheets created by doxygen. Using this option one can overrule # certain style aspects. This is preferred over using HTML_STYLESHEET -# since it does not replace the standard style sheet and is therefor more +# since it does not replace the standard style sheet and is therefore more # robust against future updates. Doxygen will copy the style sheet file to # the output directory. diff --git a/docs/doxygen/other/build_guide.dox.in b/docs/doxygen/other/build_guide.dox.in index 68e54066e8..92ef5dad24 100644 --- a/docs/doxygen/other/build_guide.dox.in +++ b/docs/doxygen/other/build_guide.dox.in @@ -194,7 +194,7 @@ If not specified, the "Release" mode is the default. \li ENABLE_STATIC_LIBS: build static library files. Default is False. \li CMAKE_TOOLCHAIN_FILE: A toolchain file to setup the CMake environment for cross-compiling. -Here are som other potentially helpful CMake flags. These are to help you specifically locate certain dependencies. While the CMake scripts themselves should generally find these for us, we can use these to help direct CMake to specific locations if we have installed a different version elsewhere on the system that CMake doesn't know about. +Here are some other potentially helpful CMake flags. These are to help you specifically locate certain dependencies. While the CMake scripts themselves should generally find these for us, we can use these to help direct CMake to specific locations if we have installed a different version elsewhere on the system that CMake doesn't know about. \li QWT_LIBRARIES: shared library to use for Qwt (in the form \<path\>/libqwt.so). \li QWT_INCLUDE_DIRS: path to Qwt include files (e.g., /usr/include/qwt). diff --git a/docs/doxygen/other/packet_txrx.dox b/docs/doxygen/other/packet_txrx.dox index c481e7e207..31417779c0 100644 --- a/docs/doxygen/other/packet_txrx.dox +++ b/docs/doxygen/other/packet_txrx.dox @@ -29,7 +29,7 @@ Typically, a packet consists of the following elements: - The payload. - A checksum, typically a CRC value, to validate the packet contents. -At the transmitter stage, these are modulated and prepared for transmission (a forward error correction code may also be applied). Because the transmitter knows te packet length, is a trivial matter to create the transmit frames using the tagged stream blocks. +At the transmitter stage, these are modulated and prepared for transmission (a forward error correction code may also be applied). Because the transmitter knows the packet length, is a trivial matter to create the transmit frames using the tagged stream blocks. The receiver has to perform a multitude of things to obtain the packet again. Most importantly, it has to convert an infinite stream (coming from the receiver diff --git a/gnuradio-runtime/examples/volk_benchmark/volk_test_funcs.py b/gnuradio-runtime/examples/volk_benchmark/volk_test_funcs.py index 0f2c84100a..a7dd7b705c 100644 --- a/gnuradio-runtime/examples/volk_benchmark/volk_test_funcs.py +++ b/gnuradio-runtime/examples/volk_benchmark/volk_test_funcs.py @@ -158,7 +158,7 @@ def timeit(tb, iterations): def format_results(kernel, times): ''' - Convinience function to convert the results of the timeit function + Convenience function to convert the results of the timeit function into a dictionary. ''' res = dict() diff --git a/gnuradio-runtime/include/gnuradio/block.h b/gnuradio-runtime/include/gnuradio/block.h index 1b6f66d45b..eb547f3022 100644 --- a/gnuradio-runtime/include/gnuradio/block.h +++ b/gnuradio-runtime/include/gnuradio/block.h @@ -859,7 +859,7 @@ namespace gr { */ void notify_msg_neighbors(); - /*! \brief Make sure we dont think we are finished + /*! \brief Make sure we don't think we are finished */ void clear_finished(){ d_finished = false; } diff --git a/gnuradio-runtime/include/gnuradio/block_gateway.h b/gnuradio-runtime/include/gnuradio/block_gateway.h index bb0c26f8f2..ef218ea662 100644 --- a/gnuradio-runtime/include/gnuradio/block_gateway.h +++ b/gnuradio-runtime/include/gnuradio/block_gateway.h @@ -70,13 +70,13 @@ namespace gr { int general_work_args_noutput_items; std::vector<int> general_work_args_ninput_items; - std::vector<void *> general_work_args_input_items; //TODO this should be const void*, but swig cant int cast it right + std::vector<void *> general_work_args_input_items; //TODO this should be const void*, but swig can't int cast it right std::vector<void *> general_work_args_output_items; int general_work_args_return_value; int work_args_ninput_items; int work_args_noutput_items; - std::vector<void *> work_args_input_items; //TODO this should be const void*, but swig cant int cast it right + std::vector<void *> work_args_input_items; //TODO this should be const void*, but swig can't int cast it right std::vector<void *> work_args_output_items; int work_args_return_value; diff --git a/gnuradio-runtime/include/gnuradio/logger.h.in b/gnuradio-runtime/include/gnuradio/logger.h.in index ec3c347f9e..476371c9e5 100644 --- a/gnuradio-runtime/include/gnuradio/logger.h.in +++ b/gnuradio-runtime/include/gnuradio/logger.h.in @@ -376,7 +376,7 @@ namespace gr { /*! * \brief Class to control configuration of logger. - * This is a singleton that cna launch a thread to wathc a config file for changes + * This is a singleton that can launch a thread to watch a config file for changes * \ingroup logging */ class GR_RUNTIME_API logger_config @@ -468,7 +468,7 @@ namespace gr { /*! * \brief Retrieve a pointer to a logger by name * - * Retrives a logger pointer + * Retrieves a logger pointer * \p name. * * \param name Name of the logger for which a pointer is requested @@ -613,7 +613,7 @@ namespace gr { * * \param logger Logger to which appender will be added * \param target Std target to write 'cout' or 'cerr' (default is cout) - * \param pattern Formating pattern for log messages + * \param pattern Formatting pattern for log messages */ GR_RUNTIME_API void logger_add_console_appender(logger_ptr logger, std::string target, @@ -626,7 +626,7 @@ namespace gr { * * \param logger Logger to which appender will be added * \param target Std target to write 'cout' or 'cerr' (default is cout) - * \param pattern Formating pattern for log messages + * \param pattern Formatting pattern for log messages */ GR_RUNTIME_API void logger_set_console_appender(logger_ptr logger, std::string target, @@ -640,7 +640,7 @@ namespace gr { * \param logger Logger to which appender will be added * \param filename File to which log will be written * \param append Overwrite or append to log file - * \param pattern Formating pattern for log messages + * \param pattern Formatting pattern for log messages */ GR_RUNTIME_API void logger_add_file_appender(logger_ptr logger, std::string filename, @@ -653,7 +653,7 @@ namespace gr { * \param logger Logger to which appender will be added * \param filename File to which log will be written * \param append Overwrite or append to log file - * \param pattern Formating pattern for log messages + * \param pattern Formatting pattern for log messages */ GR_RUNTIME_API void logger_set_file_appender(logger_ptr logger, std::string filename, @@ -670,7 +670,7 @@ namespace gr { * \param bkup_index Number of files to write * \param append Overwrite or append to log file * \param mode Permissions to set on log file - * \param pattern Formating pattern for log messages + * \param pattern Formatting pattern for log messages */ GR_RUNTIME_API void logger_add_rollingfile_appender(logger_ptr logger, std::string filename, size_t filesize, int bkup_index, bool append, @@ -766,7 +766,7 @@ namespace gr { logger_ptr d_logger; public: /*! - * \brief contructor Provide name of logger to associate with this class + * \brief constructor Provide name of logger to associate with this class * \param logger_name Name of logger associated with class */ logger(std::string logger_name) { diff --git a/gnuradio-runtime/include/gnuradio/math.h b/gnuradio-runtime/include/gnuradio/math.h index d611c98c95..e60f56b594 100644 --- a/gnuradio-runtime/include/gnuradio/math.h +++ b/gnuradio-runtime/include/gnuradio/math.h @@ -49,7 +49,7 @@ namespace gr { * * This function calculates the angle of the vector (x,y) based on a * table lookup and linear interpolation. The table uses a 256 point - * table covering -45 to +45 degrees and uses symetry to determine + * table covering -45 to +45 degrees and uses symmetry to determine * the final angle value in the range of -180 to 180 degrees. Note * that this function uses the small angle approximation for values * close to zero. This routine calculates the arc tangent with an diff --git a/gnuradio-runtime/include/gnuradio/prefs.h b/gnuradio-runtime/include/gnuradio/prefs.h index 287f86cc7c..ccb4db1e20 100644 --- a/gnuradio-runtime/include/gnuradio/prefs.h +++ b/gnuradio-runtime/include/gnuradio/prefs.h @@ -39,7 +39,7 @@ namespace gr { * \brief Base class for representing user preferences a la windows INI files. * \ingroup misc * - * The real implementation is in Python, and is accessable from C++ + * The real implementation is in Python, and is accessible from C++ * via the magic of SWIG directors. */ class GR_RUNTIME_API prefs diff --git a/gnuradio-runtime/include/gnuradio/pycallback_object.h b/gnuradio-runtime/include/gnuradio/pycallback_object.h index 85a883c3d3..f0857b6c8e 100644 --- a/gnuradio-runtime/include/gnuradio/pycallback_object.h +++ b/gnuradio-runtime/include/gnuradio/pycallback_object.h @@ -42,7 +42,7 @@ public: } }; -/* template specializations for vectors that cant use pmt::mp() */ +/* template specializations for vectors that can't use pmt::mp() */ template<> pmt::pmt_t pmt_assist<std::vector<float> >::make(std::vector<float> _val) { diff --git a/gnuradio-runtime/include/gnuradio/thread/thread.h b/gnuradio-runtime/include/gnuradio/thread/thread.h index 20a94cba52..3fda5d86ce 100644 --- a/gnuradio-runtime/include/gnuradio/thread/thread.h +++ b/gnuradio-runtime/include/gnuradio/thread/thread.h @@ -64,7 +64,7 @@ namespace gr { /*! \brief Get the current thread's ID as a gr_thread_t * * We use this when setting the thread affinity or any other - * low-level thread settings. Can be called withing a GNU Radio + * low-level thread settings. Can be called within a GNU Radio * block to get a reference to its current thread ID. */ GR_RUNTIME_API gr_thread_t get_current_thread_id(); diff --git a/gnuradio-runtime/include/gnuradio/thrift_application_base.h b/gnuradio-runtime/include/gnuradio/thrift_application_base.h index d3721939a3..34622cacfe 100644 --- a/gnuradio-runtime/include/gnuradio/thrift_application_base.h +++ b/gnuradio-runtime/include/gnuradio/thrift_application_base.h @@ -174,7 +174,7 @@ private: // and since ::i() is static, this function must be static as well. static void start_application(); - // Pointer to the structure containing staticly allocated + // Pointer to the structure containing statically allocated // state information for the applicaiton_base singleton. static boost::scoped_ptr<thrift_application_base_impl > p_impl; diff --git a/gnuradio-runtime/include/pmt/pmt.h b/gnuradio-runtime/include/pmt/pmt.h index 00564cc8d3..cb2191dd87 100644 --- a/gnuradio-runtime/include/pmt/pmt.h +++ b/gnuradio-runtime/include/pmt/pmt.h @@ -314,7 +314,7 @@ PMT_API pmt_t cadddr(pmt_t pair); * ------------------------------------------------------------------------ */ -//! Return true if \p x is a tuple, othewise false. +//! Return true if \p x is a tuple, otherwise false. PMT_API bool is_tuple(pmt_t x); PMT_API pmt_t make_tuple(); @@ -348,7 +348,7 @@ PMT_API pmt_t tuple_ref(const pmt_t &tuple, size_t k); * ------------------------------------------------------------------------ */ -//! Return true if \p x is a vector, othewise false. +//! Return true if \p x is a vector, otherwise false. PMT_API bool is_vector(pmt_t x); //! Make a vector of length \p k, with initial values set to \p fill @@ -374,7 +374,7 @@ PMT_API void vector_fill(pmt_t vector, pmt_t fill); * ------------------------------------------------------------------------ */ -//! Return true if \p x is a blob, othewise false. +//! Return true if \p x is a blob, otherwise false. PMT_API bool is_blob(pmt_t x); /*! diff --git a/gnuradio-runtime/lib/block_executor.cc b/gnuradio-runtime/lib/block_executor.cc index 30bdacecf5..754744449a 100644 --- a/gnuradio-runtime/lib/block_executor.cc +++ b/gnuradio-runtime/lib/block_executor.cc @@ -108,7 +108,7 @@ namespace gr { return true; case block::TPP_ALL_TO_ALL: { - // every tag on every input propogates to everyone downstream + // every tag on every input propagates to everyone downstream std::vector<buffer_sptr> out_buf; for(int i = 0; i < d->ninputs(); i++) { diff --git a/gnuradio-runtime/lib/logger.cc b/gnuradio-runtime/lib/logger.cc index fd9a482c94..0d9e13fc3e 100644 --- a/gnuradio-runtime/lib/logger.cc +++ b/gnuradio-runtime/lib/logger.cc @@ -46,7 +46,7 @@ namespace gr { /************************ BEGIN LOG4CPP HELPERS ***********************/ /* Logger config class. This is a singleton that controls how * log4cpp is configured If watch_period>0 a thread is started to - * watch teh config file for changes. + * watch the config file for changes. */ // Getters of logger_config diff --git a/gnuradio-runtime/lib/math/fast_atan2f.cc b/gnuradio-runtime/lib/math/fast_atan2f.cc index f968310ff8..72e7291913 100644 --- a/gnuradio-runtime/lib/math/fast_atan2f.cc +++ b/gnuradio-runtime/lib/math/fast_atan2f.cc @@ -114,7 +114,7 @@ namespace gr { Description: This function calculates the angle of the vector (x,y) based on a table lookup and linear interpolation. The table uses a - 256 point table covering -45 to +45 degrees and uses symetry to + 256 point table covering -45 to +45 degrees and uses symmetry to determine the final angle value in the range of -180 to 180 degrees. Note that this function uses the small angle approximation for values close to zero. This routine calculates the arc tangent diff --git a/gnuradio-runtime/lib/math/qa_fxpt.cc b/gnuradio-runtime/lib/math/qa_fxpt.cc index 070fb66ccf..d3aadf85b1 100644 --- a/gnuradio-runtime/lib/math/qa_fxpt.cc +++ b/gnuradio-runtime/lib/math/qa_fxpt.cc @@ -46,7 +46,7 @@ qa_fxpt::t0() * These are disabled because of some precision issues. * * Different compilers seem to have different opinions on whether - * the calulations are done single or double (or extended) + * the calculations are done single or double (or extended) * precision. Any of the answers are fine for our real purpose, but * sometimes the answer is off by a few bits at the bottom. * Hence, the disabled check. diff --git a/gnuradio-runtime/lib/test.h b/gnuradio-runtime/lib/test.h index 24266ab977..a8019bc3b7 100644 --- a/gnuradio-runtime/lib/test.h +++ b/gnuradio-runtime/lib/test.h @@ -46,11 +46,11 @@ namespace gr { * \brief Test class for testing runtime system (setting up buffers and such.) * \ingroup misc * - * This block does not do any usefull actual data processing. It + * This block does not do any useful actual data processing. It * just exposes setting all standard block parameters using the - * contructor or public methods. + * constructor or public methods. * - * This block can be usefull when testing the runtime system. + * This block can be useful when testing the runtime system. * You can force this block to have a large history, decimation * factor and/or large output_multiple. * The runtime system should detect this and create large enough buffers diff --git a/gnuradio-runtime/python/gnuradio/ctrlport/GrDataPlotter.py b/gnuradio-runtime/python/gnuradio/ctrlport/GrDataPlotter.py index c5bfd0a8cb..e0499c5eba 100644 --- a/gnuradio-runtime/python/gnuradio/ctrlport/GrDataPlotter.py +++ b/gnuradio-runtime/python/gnuradio/ctrlport/GrDataPlotter.py @@ -141,7 +141,7 @@ class GrDataPlotParent(gr.top_block, QtGui.QWidget): npts = self.get_npts() if(self._npts != npts): - # Adjust buffers to accomodate new settings + # Adjust buffers to accommodate new settings for n in xrange(self._ncons): if(npts < self._npts): if(self._data_len[n] < npts): diff --git a/gnuradio-runtime/python/gnuradio/gr/gateway.py b/gnuradio-runtime/python/gnuradio/gr/gateway.py index 2e46bca430..8403421dd5 100644 --- a/gnuradio-runtime/python/gnuradio/gr/gateway.py +++ b/gnuradio-runtime/python/gnuradio/gr/gateway.py @@ -46,7 +46,7 @@ def pointer_to_ndarray(addr, dtype, nitems): ######################################################################## class gateway_handler(gr.feval_ll): - #dont put a constructor, it wont work + #don't put a constructor, it won't work def init(self, callback): self._callback = callback @@ -64,7 +64,7 @@ class gateway_handler(gr.feval_ll): ######################################################################## class msg_handler(gr.feval_p): - #dont put a constructor, it wont work + #don't put a constructor, it won't work def init(self, callback): self._callback = callback diff --git a/gnuradio-runtime/python/gnuradio/gr/gr_threading_23.py b/gnuradio-runtime/python/gnuradio/gr/gr_threading_23.py index dee8034c1c..795c1593d4 100644 --- a/gnuradio-runtime/python/gnuradio/gr/gr_threading_23.py +++ b/gnuradio-runtime/python/gnuradio/gr/gr_threading_23.py @@ -106,7 +106,7 @@ class _RLock(_Verbose): self.__owner = me self.__count = 1 if __debug__: - self._note("%s.acquire(%s): initial succes", self, blocking) + self._note("%s.acquire(%s): initial success", self, blocking) else: if __debug__: self._note("%s.acquire(%s): failure", self, blocking) diff --git a/gnuradio-runtime/python/gnuradio/gr/gr_threading_24.py b/gnuradio-runtime/python/gnuradio/gr/gr_threading_24.py index 8539bfc047..8ad880b090 100644 --- a/gnuradio-runtime/python/gnuradio/gr/gr_threading_24.py +++ b/gnuradio-runtime/python/gnuradio/gr/gr_threading_24.py @@ -106,7 +106,7 @@ class _RLock(_Verbose): self.__owner = me self.__count = 1 if __debug__: - self._note("%s.acquire(%s): initial succes", self, blocking) + self._note("%s.acquire(%s): initial success", self, blocking) else: if __debug__: self._note("%s.acquire(%s): failure", self, blocking) diff --git a/gnuradio-runtime/python/gnuradio/gr_unittest.py b/gnuradio-runtime/python/gnuradio/gr_unittest.py index c729566e88..b20fa076de 100755 --- a/gnuradio-runtime/python/gnuradio/gr_unittest.py +++ b/gnuradio-runtime/python/gnuradio/gr_unittest.py @@ -40,7 +40,7 @@ class TestCase(unittest.TestCase): (default 7) and comparing to zero. Note that decimal places (from zero) is usually not the same - as significant digits (measured from the most signficant digit). + as significant digits (measured from the most significant digit). """ if round(second.real-first.real, places) != 0: raise self.failureException, \ diff --git a/gnuradio-runtime/python/gnuradio/gru/freqz.py b/gnuradio-runtime/python/gnuradio/gru/freqz.py index 6d8b94db8b..a24d13ddee 100644 --- a/gnuradio-runtime/python/gnuradio/gru/freqz.py +++ b/gnuradio-runtime/python/gnuradio/gru/freqz.py @@ -118,7 +118,7 @@ class poly1d: p[k] is the coefficient on the kth power of x (backwards from sequencing the coefficient array. - polynomials can be added, substracted, multplied and divided (returns + polynomials can be added, substracted, multiplied and divided (returns quotient and remainder). asarray(p) will also give the coefficient array, so polynomials can be used in all functions that accept arrays. diff --git a/gnuradio-runtime/python/pmt/pmt_to_python.py b/gnuradio-runtime/python/pmt/pmt_to_python.py index f9000ec279..2909c93c21 100644 --- a/gnuradio-runtime/python/pmt/pmt_to_python.py +++ b/gnuradio-runtime/python/pmt/pmt_to_python.py @@ -91,7 +91,7 @@ def numpy_to_uvector(numpy_array): pc = map(mapping[1], numpy.ravel(numpy_array)) return mapping[0](numpy_array.size, pc) except KeyError: - raise ValueError("unsupported numpy array dtype for converstion to pmt %s"%(numpy_array.dtype)) + raise ValueError("unsupported numpy array dtype for conversion to pmt %s"%(numpy_array.dtype)) def uvector_to_numpy(uvector): match = None diff --git a/gnuradio-runtime/swig/gr_intrusive_ptr.i b/gnuradio-runtime/swig/gr_intrusive_ptr.i index 40c438d004..3b3c9242ab 100644 --- a/gnuradio-runtime/swig/gr_intrusive_ptr.i +++ b/gnuradio-runtime/swig/gr_intrusive_ptr.i @@ -1,6 +1,6 @@ // This file was borrowed from the SWIG project to allow use to // wrap PMTs that use intrusive pointers. This is only necessary -// to support backwards compatability with older distributions of +// to support backwards compatibility with older distributions of // Linux that do not natively support a new enough version of SWIG. // We do this to prevent having to update our dependency on a new // SWIG. Eventually, the need for this should go away. diff --git a/gr-analog/include/gnuradio/analog/pll_carriertracking_cc.h b/gr-analog/include/gnuradio/analog/pll_carriertracking_cc.h index ce4170fff1..dceb3a618f 100644 --- a/gr-analog/include/gnuradio/analog/pll_carriertracking_cc.h +++ b/gr-analog/include/gnuradio/analog/pll_carriertracking_cc.h @@ -43,7 +43,7 @@ namespace gr { * input and outputs that signal, downconverted to DC * * All settings max_freq and min_freq are in terms of radians per - * sample, NOT HERTZ. The loop bandwidth determins the lock range + * sample, NOT HERTZ. The loop bandwidth determines the lock range * and should be set around pi/200 -- 2pi/100. \sa * pll_freqdet_cf, pll_carriertracking_cc */ diff --git a/gr-analog/include/gnuradio/analog/pll_freqdet_cf.h b/gr-analog/include/gnuradio/analog/pll_freqdet_cf.h index 88eb46edc5..a7bd654c99 100644 --- a/gr-analog/include/gnuradio/analog/pll_freqdet_cf.h +++ b/gr-analog/include/gnuradio/analog/pll_freqdet_cf.h @@ -42,7 +42,7 @@ namespace gr { * This PLL locks onto a [possibly noisy] reference carrier on * the input and outputs an estimate of that frequency in radians per sample. * All settings max_freq and min_freq are in terms of radians per sample, - * NOT HERTZ. The loop bandwidth determins the lock range and should be set + * NOT HERTZ. The loop bandwidth determines the lock range and should be set * around pi/200 -- 2pi/100. * \sa pll_refout_cc, pll_carriertracking_cc */ diff --git a/gr-analog/include/gnuradio/analog/pll_refout_cc.h b/gr-analog/include/gnuradio/analog/pll_refout_cc.h index 9f9d168111..c73be94309 100644 --- a/gr-analog/include/gnuradio/analog/pll_refout_cc.h +++ b/gr-analog/include/gnuradio/analog/pll_refout_cc.h @@ -43,7 +43,7 @@ namespace gr { * aligned to it. * * All settings max_freq and min_freq are in terms of radians per - * sample, NOT HERTZ. The loop bandwidth determins the lock range + * sample, NOT HERTZ. The loop bandwidth determines the lock range * and should be set around pi/200 -- 2pi/100. \sa * pll_freqdet_cf, pll_carriertracking_cc */ diff --git a/gr-analog/python/analog/fm_emph.py b/gr-analog/python/analog/fm_emph.py index bfa4742ace..348fb172d5 100644 --- a/gr-analog/python/analog/fm_emph.py +++ b/gr-analog/python/analog/fm_emph.py @@ -61,7 +61,7 @@ import cmath # The digital deemphasis filter design below, uses the # "bilinear transformation" method of designing digital filters: # -# 1. Convert digitial specifications into the analog domain, by prewarping +# 1. Convert digital specifications into the analog domain, by prewarping # digital frequency specifications into analog frequencies. # # w_a = (2/T)tan(wT/2) @@ -206,7 +206,7 @@ class fm_deemph(gr.hier_block2): # The digital preemphasis filter design below, uses the # "bilinear transformation" method of designing digital filters: # -# 1. Convert digitial specifications into the analog domain, by prewarping +# 1. Convert digital specifications into the analog domain, by prewarping # digital frequency specifications into analog frequencies. # # w_a = (2/T)tan(wT/2) diff --git a/gr-atsc/include/gnuradio/atsc/fs_checker_impl.h b/gr-atsc/include/gnuradio/atsc/fs_checker_impl.h index 3ac1b8d913..8409701c1b 100644 --- a/gr-atsc/include/gnuradio/atsc/fs_checker_impl.h +++ b/gr-atsc/include/gnuradio/atsc/fs_checker_impl.h @@ -29,7 +29,7 @@ * \brief abstract base class for ATSC field sync checker * * Processes input samples one at a time looking for - * an occurence of either the field sync 1 or field sync 2 pattern. + * an occurrence of either the field sync 1 or field sync 2 pattern. * * Note that unlike atsci_fs_correlator, this class uses the symbol_num in * input_tag to avoid having to test each symbol position. diff --git a/gr-atsc/include/gnuradio/atsc/fs_correlator_impl.h b/gr-atsc/include/gnuradio/atsc/fs_correlator_impl.h index 2517877666..6b9cd6f0f1 100644 --- a/gr-atsc/include/gnuradio/atsc/fs_correlator_impl.h +++ b/gr-atsc/include/gnuradio/atsc/fs_correlator_impl.h @@ -29,7 +29,7 @@ * \brief abstract base class for ATSC field sync correlator * * Processes input samples one at a time looking for - * an occurence of either the field sync 1 or field sync 2 pattern. + * an occurrence of either the field sync 1 or field sync 2 pattern. * * For each sample processed, an output sample and an output tag are produced. * The output samples are identical to the input samples but are delayed by diff --git a/gr-atsc/lib/GrAtscBitTimingLoop.cc b/gr-atsc/lib/GrAtscBitTimingLoop.cc index 835dc14a91..3080f2a0fe 100644 --- a/gr-atsc/lib/GrAtscBitTimingLoop.cc +++ b/gr-atsc/lib/GrAtscBitTimingLoop.cc @@ -68,7 +68,7 @@ GrAtscBitTimingLoop::GrAtscBitTimingLoop () // We are nominally a 2x decimator, but our actual rate varies slightly // depending on the difference between the transmitter and receiver // sampling clocks. Hence, we need to compute our input ranges -// explictly. +// explicitly. int GrAtscBitTimingLoop::forecast(VrSampleRange output, diff --git a/gr-atsc/lib/GrAtscBitTimingLoop2.cc b/gr-atsc/lib/GrAtscBitTimingLoop2.cc index 536ca08720..665569679c 100644 --- a/gr-atsc/lib/GrAtscBitTimingLoop2.cc +++ b/gr-atsc/lib/GrAtscBitTimingLoop2.cc @@ -59,7 +59,7 @@ GrAtscBitTimingLoop2::GrAtscBitTimingLoop2 () // We are nominally a 2x decimator, but our actual rate varies slightly // depending on the difference between the transmitter and receiver // sampling clocks. Hence, we need to compute our input ranges -// explictly. +// explicitly. int GrAtscBitTimingLoop2::forecast(VrSampleRange output, diff --git a/gr-atsc/lib/GrAtscBitTimingLoop3.cc b/gr-atsc/lib/GrAtscBitTimingLoop3.cc index 14596900a9..866faf737a 100644 --- a/gr-atsc/lib/GrAtscBitTimingLoop3.cc +++ b/gr-atsc/lib/GrAtscBitTimingLoop3.cc @@ -45,7 +45,7 @@ GrAtscBitTimingLoop3::GrAtscBitTimingLoop3 (double ratio_of_rx_clock_to_symbol_f // We are nominally a 2x decimator, but our actual rate varies slightly // depending on the difference between the transmitter and receiver // sampling clocks. Hence, we need to compute our input ranges -// explictly. +// explicitly. int GrAtscBitTimingLoop3::forecast(VrSampleRange output, diff --git a/gr-atsc/lib/atsc_bit_timing_loop.cc b/gr-atsc/lib/atsc_bit_timing_loop.cc index 1458c9ed63..de9477a49f 100644 --- a/gr-atsc/lib/atsc_bit_timing_loop.cc +++ b/gr-atsc/lib/atsc_bit_timing_loop.cc @@ -96,12 +96,12 @@ atsc_bit_timing_loop::work (int noutput_items, double timing_adjustment = 0; bool seg_locked; atsc::syminfo tag; - // ammount requested in forecast + // amount requested in forecast unsigned long input_size = noutput_items * d_rx_clock_to_symbol_freq + 1500 -1; memset (&tag, 0, sizeof (tag)); - // ammount actually consumed + // amount actually consumed d_si = 0; for (k = 0; k < noutput_items; k++){ diff --git a/gr-atsc/python/atsc/atsc_rx.py b/gr-atsc/python/atsc/atsc_rx.py index 940eeac4bd..1730763567 100755 --- a/gr-atsc/python/atsc/atsc_rx.py +++ b/gr-atsc/python/atsc/atsc_rx.py @@ -32,7 +32,7 @@ # complex samples / sec, then lowpass filters with a cutoff of 3.2MHz # and a transition band width of .5MHz. Center of the tv channels is # now at 0 with edges at -3.2MHz and 3.2MHz. This puts the pilot at -# -3MHz + 309KHz. Next a root raised cosine filter is aplied to match the one +# -3MHz + 309KHz. Next a root raised cosine filter is applied to match the one # in the transmitter and thus reduce ISI. The phased locked loop then locks to # the pilot and outputs just the real part of the signal ( as information is # not stored in the phase with atsc ), this is then feed to the bit lock @@ -79,7 +79,7 @@ def graph (args): ilp_coeffs = filter.firdes.low_pass(1, input_rate, 3.2e6, .5e6, filter.firdes.WIN_HAMMING) ilp = filter.interp_fir_filter_ccf(3, ilp_coeffs) - # Move the center frequency to 5.75MHz ( this wont be needed soon ) + # Move the center frequency to 5.75MHz ( this won't be needed soon ) duc_coeffs = filter.firdes.low_pass ( 1, 19.2e6, 9e6, 1e6, filter.firdes.WIN_HAMMING ) duc = filter.freq_xlating_fir_filter_ccf ( 1, duc_coeffs, -5.75e6, 19.2e6 ) diff --git a/gr-atsc/python/atsc/qa_atsc.py b/gr-atsc/python/atsc/qa_atsc.py index e6ea81a50e..80300ace98 100755 --- a/gr-atsc/python/atsc/qa_atsc.py +++ b/gr-atsc/python/atsc/qa_atsc.py @@ -73,7 +73,7 @@ class vector_source_ts(gr.hier_block2): """ def __init__(self, ts): """ - Pad tranport stream packets to 256 bytes and reformat appropriately. + Pad transport stream packets to 256 bytes and reformat appropriately. Args: ts: MPEG transport stream. (sequence of ints in [0,255]; len(ts) % 188 == 0) @@ -105,9 +105,9 @@ class vector_sink_ts(gr.hier_block2): def data(self): """ - Extracts tranport stream from sink and returns it to python. + Extracts transport stream from sink and returns it to python. - Depads tranport stream packets from 256 back to 188 bytes. + Depads transport stream packets from 256 back to 188 bytes. @rtype: tuple of ints in [0,255]; len(result) % 188 == 0 """ return tuple(depad_transport_stream(self.sink.data())) diff --git a/gr-audio/grc/audio_sink.xml b/gr-audio/grc/audio_sink.xml index 9181055cd9..21bf8ebe42 100644 --- a/gr-audio/grc/audio_sink.xml +++ b/gr-audio/grc/audio_sink.xml @@ -78,7 +78,7 @@ <doc> Not all sampling rates will be supported by your hardware. -Leave the device name blank to choose deafult audio device. \ +Leave the device name blank to choose default audio device. \ ALSA users with audio trouble may try setting the device name to plughw:0,0 The audio sink can have multiple inputs depending upon your hardware. \ diff --git a/gr-audio/grc/audio_source.xml b/gr-audio/grc/audio_source.xml index 044b14466f..d023c37be2 100644 --- a/gr-audio/grc/audio_source.xml +++ b/gr-audio/grc/audio_source.xml @@ -78,7 +78,7 @@ <doc> Not all sampling rates will be supported by your hardware. -Leave the device name blank to choose deafult audio device. \ +Leave the device name blank to choose default audio device. \ ALSA users with audio trouble may try setting the device name to plughw:0,0 The audio source can have multiple outputs depending upon your hardware. \ diff --git a/gr-audio/lib/osx/osx_impl.cc b/gr-audio/lib/osx/osx_impl.cc index d18c24c786..f3ed94c659 100644 --- a/gr-audio/lib/osx/osx_impl.cc +++ b/gr-audio/lib/osx/osx_impl.cc @@ -267,7 +267,7 @@ find_audio_devices } std::string name_buf(c_name_buf); - // compare the retreived name with the desired one, if + // compare the retrieved name with the desired one, if // provided; case insensitive. if (device_name.length() > 0) { diff --git a/gr-audio/lib/osx/osx_sink.cc b/gr-audio/lib/osx/osx_sink.cc index 0b304eea3f..8682f834bf 100644 --- a/gr-audio/lib/osx/osx_sink.cc +++ b/gr-audio/lib/osx/osx_sink.cc @@ -371,7 +371,7 @@ namespace gr { // set up a listener for the default output device so that if // the device changes, this routine will be called and we can - // internally handle this change (if/as necesary) + // internally handle this change (if/as necessary) { AudioObjectPropertyAddress property = { @@ -1002,7 +1002,7 @@ namespace gr { This->d_queue_sample_count -= in_number_frames; } - // signal that data is available, if appropraite + // signal that data is available, if appropriate if (This->d_waiting_for_data) { #if _OSX_AU_DEBUG_RENDER_ diff --git a/gr-audio/lib/osx/osx_source.cc b/gr-audio/lib/osx/osx_source.cc index bac94fbd72..0485c5478a 100644 --- a/gr-audio/lib/osx/osx_source.cc +++ b/gr-audio/lib/osx/osx_source.cc @@ -1455,7 +1455,7 @@ namespace gr { << ", mSC = " << This->d_buffer_sample_count << std::endl; #endif - // signal that data is available, if appropraite + // signal that data is available, if appropriate if (This->d_waiting_for_data) { This->d_cond_data.notify_one(); diff --git a/gr-audio/lib/portaudio/portaudio_sink.cc b/gr-audio/lib/portaudio/portaudio_sink.cc index e6698adb72..9803559487 100644 --- a/gr-audio/lib/portaudio/portaudio_sink.cc +++ b/gr-audio/lib/portaudio/portaudio_sink.cc @@ -80,7 +80,7 @@ namespace gr { N_BUFFERS*bufsize_samples/d_output_parameters.channelCount); } - // FYI, the buffer indicies are in units of samples. + // FYI, the buffer indices are in units of samples. d_writer = gr::make_buffer(N_BUFFERS * bufsize_samples, sizeof(sample_t)); d_reader = gr::buffer_add_reader(d_writer, 0); } diff --git a/gr-audio/lib/portaudio/portaudio_source.cc b/gr-audio/lib/portaudio/portaudio_source.cc index 7f2e8f30b9..789197472f 100644 --- a/gr-audio/lib/portaudio/portaudio_source.cc +++ b/gr-audio/lib/portaudio/portaudio_source.cc @@ -80,7 +80,7 @@ namespace gr { N_BUFFERS*bufsize_samples/d_input_parameters.channelCount); } - // FYI, the buffer indicies are in units of samples. + // FYI, the buffer indices are in units of samples. d_writer = gr::make_buffer(N_BUFFERS * bufsize_samples, sizeof(sample_t)); d_reader = gr::buffer_add_reader(d_writer, 0); } @@ -323,7 +323,7 @@ namespace gr { // There's no data and we're not allowed to block. // (A USRP is most likely controlling the pacing through the pipeline.) - // This is an underun. The scheduler wouldn't have called us if it + // This is an underrun. The scheduler wouldn't have called us if it // had anything better to do. Thus we really need to produce some amount // of "fill". // diff --git a/gr-blocks/grc/blocks_message_strobe_random.xml b/gr-blocks/grc/blocks_message_strobe_random.xml index 573db58aef..2ba2d4519a 100644 --- a/gr-blocks/grc/blocks_message_strobe_random.xml +++ b/gr-blocks/grc/blocks_message_strobe_random.xml @@ -64,6 +64,6 @@ Please note some peculiarities below: - poisson does not care about your std - gaussian operates as expected - - uniform is actually of the range (mean-std, mean+std) - thus we are lieing and it is not actually an std here + - uniform is actually of the range (mean-std, mean+std) - thus we are lying and it is not actually an std here </doc> </block> diff --git a/gr-blocks/grc/blocks_vector_insert_x.xml b/gr-blocks/grc/blocks_vector_insert_x.xml index 2bc7ada2e6..f70027f53f 100644 --- a/gr-blocks/grc/blocks_vector_insert_x.xml +++ b/gr-blocks/grc/blocks_vector_insert_x.xml @@ -75,6 +75,6 @@ Periodicity, the length of the periodicity at which the vector should be inserted at the output. (i.e. one vector for every N output items) - Offset sepcifies where in the cycle period we should begin at. + Offset specifies where in the cycle period we should begin at. </doc> </block> diff --git a/gr-blocks/include/gnuradio/blocks/interleave.h b/gr-blocks/include/gnuradio/blocks/interleave.h index 7f7587d267..5de75fcce4 100644 --- a/gr-blocks/include/gnuradio/blocks/interleave.h +++ b/gr-blocks/include/gnuradio/blocks/interleave.h @@ -38,7 +38,7 @@ namespace gr { * This block interleaves blocks of samples. For each input * connection, the samples are interleaved successively to the * output connection. By default, the block interleaves a single - * sample from eahc input to the output unless blocksize is given + * sample from each input to the output unless blocksize is given * in the constructor. * * \code diff --git a/gr-blocks/include/gnuradio/blocks/peak_detector_XX.h.t b/gr-blocks/include/gnuradio/blocks/peak_detector_XX.h.t index a255e46f0b..6e151c0cbd 100644 --- a/gr-blocks/include/gnuradio/blocks/peak_detector_XX.h.t +++ b/gr-blocks/include/gnuradio/blocks/peak_detector_XX.h.t @@ -48,12 +48,12 @@ namespace gr { /*! * Make a peak detector block. * - * \param threshold_factor_rise The threshold factor determins + * \param threshold_factor_rise The threshold factor determines * when a peak has started. An average of the signal is * calculated and when the value of the signal goes over * threshold_factor_rise*average, we start looking for a * peak. - * \param threshold_factor_fall The threshold factor determins + * \param threshold_factor_fall The threshold factor determines * when a peak has ended. An average of the signal is * calculated and when the value of the signal goes * below threshold_factor_fall*average, we stop looking diff --git a/gr-blocks/include/gnuradio/blocks/tcp_server_sink.h b/gr-blocks/include/gnuradio/blocks/tcp_server_sink.h index 6d951a8e67..a8a5908fdd 100644 --- a/gr-blocks/include/gnuradio/blocks/tcp_server_sink.h +++ b/gr-blocks/include/gnuradio/blocks/tcp_server_sink.h @@ -34,8 +34,8 @@ namespace gr { * \ingroup networking_tools_blk * * \details - * Listen for incomming TCP connection(s). Duplicate data for each - * opened connection. Optionaly can wait until first client connects + * Listen for incoming TCP connection(s). Duplicate data for each + * opened connection. Optionally can wait until first client connects * before streaming starts. */ class BLOCKS_API tcp_server_sink : virtual public gr::sync_block diff --git a/gr-blocks/include/gnuradio/blocks/wavfile.h b/gr-blocks/include/gnuradio/blocks/wavfile.h index bc1175a6cb..2c03319c4a 100644 --- a/gr-blocks/include/gnuradio/blocks/wavfile.h +++ b/gr-blocks/include/gnuradio/blocks/wavfile.h @@ -91,7 +91,7 @@ namespace gr { * Note: The stream position is changed during this function. If * anything needs to be written to the WAV file after calling this * function (which shouldn't happen), you need to fseek() to the - * end of the file (or whereever). + * end of the file (or wherever). * * \param[in] fp File pointer to an open WAV file with a blank header * \param[in] byte_count Length of all samples written to the file in bytes. diff --git a/gr-blocks/lib/message_strobe_impl.cc b/gr-blocks/lib/message_strobe_impl.cc index d12e0ebd4d..96b079a0ed 100644 --- a/gr-blocks/lib/message_strobe_impl.cc +++ b/gr-blocks/lib/message_strobe_impl.cc @@ -67,7 +67,7 @@ namespace gr { bool message_strobe_impl::start() { - // NOTE: d_finished should be something explicitely thread safe. But since + // NOTE: d_finished should be something explicitly thread safe. But since // nothing breaks on concurrent access, I'll just leave it as bool. d_finished = false; d_thread = boost::shared_ptr<gr::thread::thread> diff --git a/gr-blocks/python/blocks/qa_wavfile.py b/gr-blocks/python/blocks/qa_wavfile.py index 5c3a69e1d0..97978c936d 100755 --- a/gr-blocks/python/blocks/qa_wavfile.py +++ b/gr-blocks/python/blocks/qa_wavfile.py @@ -54,7 +54,7 @@ class test_wavefile(gr_unittest.TestCase): self.tb.run() wf_out.close() - # we're loosing all extra header chunks + # we're losing all extra header chunks self.assertEqual(getsize(infile) - g_extra_header_len, getsize(outfile)) in_f = file(infile, 'rb') diff --git a/gr-channels/examples/demo_two_tone.grc b/gr-channels/examples/demo_two_tone.grc index df544d8e85..a55223ca5e 100644 --- a/gr-channels/examples/demo_two_tone.grc +++ b/gr-channels/examples/demo_two_tone.grc @@ -485,7 +485,7 @@ </param> <param> <key>label</key> - <value>Singal Power (dB)</value> + <value>Signal Power (dB)</value> </param> <param> <key>value</key> diff --git a/gr-digital/README b/gr-digital/README index af2005c97c..73562f8e11 100644 --- a/gr-digital/README +++ b/gr-digital/README @@ -1,4 +1,4 @@ -This GNU Radio component for implementing digitial modulators and demodulators. +This GNU Radio component for implementing digital modulators and demodulators. FIXME: just fixme.
\ No newline at end of file diff --git a/gr-digital/examples/narrowband/README b/gr-digital/examples/narrowband/README index 1c50ad69b8..296a20f4a4 100644 --- a/gr-digital/examples/narrowband/README +++ b/gr-digital/examples/narrowband/README @@ -26,7 +26,7 @@ etc. The boards need to be at least 3m apart. You can also try experimenting with the rx gain (-g <gain> command line option). Generally speaking, I start the rx first on one machine, and then fire -up the tx on the other machine. The tx also supports a discontinous +up the tx on the other machine. The tx also supports a discontinuous transmission mode where it sends bursts of 5 packets and then waits 1 second. This is useful for ensuring that all the receiver control loops lock up fast enough. diff --git a/gr-digital/examples/narrowband/benchmark_tx.py b/gr-digital/examples/narrowband/benchmark_tx.py index 2cb74d5a77..e0744e79a7 100755 --- a/gr-digital/examples/narrowband/benchmark_tx.py +++ b/gr-digital/examples/narrowband/benchmark_tx.py @@ -92,7 +92,7 @@ def main(): parser.add_option("-M", "--megabytes", type="eng_float", default=1.0, help="set megabytes to transmit [default=%default]") parser.add_option("","--discontinuous", action="store_true", default=False, - help="enable discontinous transmission (bursts of 5 packets)") + help="enable discontinuous transmission (bursts of 5 packets)") parser.add_option("","--from-file", default=None, help="use intput file for packet contents") parser.add_option("","--to-file", default=None, diff --git a/gr-digital/examples/narrowband/receive_path.py b/gr-digital/examples/narrowband/receive_path.py index 8bbfe92770..9b44ae3f75 100644 --- a/gr-digital/examples/narrowband/receive_path.py +++ b/gr-digital/examples/narrowband/receive_path.py @@ -139,7 +139,7 @@ class receive_path(gr.hier_block2): expert.add_option("", "--log", action="store_true", default=False, help="Log all parts of flow graph to files (CAUTION: lots of data)") expert.add_option("", "--chbw-factor", type="float", default=1.0, - help="Channel bandwidth = chbw_factor x signal bandwidth [defaut=%default]") + help="Channel bandwidth = chbw_factor x signal bandwidth [default=%default]") def _print_verbage(self): """ diff --git a/gr-digital/grc/digital_symbol_sync_xx.xml b/gr-digital/grc/digital_symbol_sync_xx.xml index ffd2f5daff..fc1b60ed6d 100644 --- a/gr-digital/grc/digital_symbol_sync_xx.xml +++ b/gr-digital/grc/digital_symbol_sync_xx.xml @@ -89,12 +89,12 @@ <opt>hide_constellation:all</opt> </option> <option> - <name>y[n]y'[n] Maximum Likelyhood</name> + <name>y[n]y'[n] Maximum Likelihood</name> <key>digital.TED_SIGNAL_TIMES_SLOPE_ML</key> <opt>hide_constellation:all</opt> </option> <option> - <name>sgn(y[n])y'[n] Maximum Likelyhood</name> + <name>sgn(y[n])y'[n] Maximum Likelihood</name> <key>digital.TED_SIGNUM_TIMES_SLOPE_ML</key> <opt>hide_constellation:all</opt> </option> diff --git a/gr-digital/include/gnuradio/digital/lfsr.h b/gr-digital/include/gnuradio/digital/lfsr.h index ce82f6f5e1..57bda3b0a6 100644 --- a/gr-digital/include/gnuradio/digital/lfsr.h +++ b/gr-digital/include/gnuradio/digital/lfsr.h @@ -52,12 +52,12 @@ namespace gr { * x^6 + x^5 + x^0 = 0x61 * * \param seed - the initialization vector placed into the - * register durring initialization. Low order bit + * register during initialization. Low order bit * corresponds to x^0 coefficient -- the first to be * shifted as output. * * \param reg_len - specifies the length of the feedback shift - * register to be used. Durring each iteration, the + * register to be used. During each iteration, the * register is rightshifted one and the new bit is * placed in bit reg_len. reg_len should generally be * at least order(mask) + 1 diff --git a/gr-digital/include/gnuradio/digital/simple_framer.h b/gr-digital/include/gnuradio/digital/simple_framer.h index f0588eb20e..cddb152ca3 100644 --- a/gr-digital/include/gnuradio/digital/simple_framer.h +++ b/gr-digital/include/gnuradio/digital/simple_framer.h @@ -36,7 +36,7 @@ namespace gr { * * \details * Takes in enough samples to create a full output frame. The - * frame is prepended with the GRSF_SYNC (defind in + * frame is prepended with the GRSF_SYNC (defined in * simple_framer_sync.h) and an 8-bit sequence number. */ class DIGITAL_API simple_framer : virtual public block diff --git a/gr-digital/include/gnuradio/digital/symbol_sync_cc.h b/gr-digital/include/gnuradio/digital/symbol_sync_cc.h index dc856ecaf6..24cd0a14de 100644 --- a/gr-digital/include/gnuradio/digital/symbol_sync_cc.h +++ b/gr-digital/include/gnuradio/digital/symbol_sync_cc.h @@ -148,7 +148,7 @@ namespace gr { * \brief Returns the normalized approximate loop bandwidth. * * \details - * See the documenation for set_loop_bandwidth() for more details. + * See the documentation for set_loop_bandwidth() for more details. * * Note that if set_alpha() or set_beta() were called to directly * set gains, the value returned by this method will be inaccurate/stale. @@ -159,7 +159,7 @@ namespace gr { * \brief Returns the loop damping factor. * * \details - * See the documenation for set_damping_factor() for more details. + * See the documentation for set_damping_factor() for more details. * * Note that if set_alpha() or set_beta() were called to directly * set gains, the value returned by this method will be inaccurate/stale. @@ -171,7 +171,7 @@ namespace gr { * Detector. * * \details - * See the documenation for set_ted_gain() for more details. + * See the documentation for set_ted_gain() for more details. */ virtual float ted_gain() const = 0; @@ -179,7 +179,7 @@ namespace gr { * \brief Returns the PI filter proportional gain, alpha. * * \details - * See the documenation for set_alpha() for more details. + * See the documentation for set_alpha() for more details. */ virtual float alpha() const = 0; @@ -187,7 +187,7 @@ namespace gr { * \brief Returns the PI filter integral gain, beta. * * \details - * See the documenation for set_beta() for more details. + * See the documentation for set_beta() for more details. */ virtual float beta() const = 0; diff --git a/gr-digital/include/gnuradio/digital/symbol_sync_ff.h b/gr-digital/include/gnuradio/digital/symbol_sync_ff.h index f551c0a96c..027ecca520 100644 --- a/gr-digital/include/gnuradio/digital/symbol_sync_ff.h +++ b/gr-digital/include/gnuradio/digital/symbol_sync_ff.h @@ -148,7 +148,7 @@ namespace gr { * \brief Returns the normalized approximate loop bandwidth. * * \details - * See the documenation for set_loop_bandwidth() for more details. + * See the documentation for set_loop_bandwidth() for more details. * * Note that if set_alpha() or set_beta() were called to directly * set gains, the value returned by this method will be inaccurate/stale. @@ -159,7 +159,7 @@ namespace gr { * \brief Returns the loop damping factor. * * \details - * See the documenation for set_damping_factor() for more details. + * See the documentation for set_damping_factor() for more details. * * Note that if set_alpha() or set_beta() were called to directly * set gains, the value returned by this method will be inaccurate/stale. @@ -171,7 +171,7 @@ namespace gr { * Detector. * * \details - * See the documenation for set_ted_gain() for more details. + * See the documentation for set_ted_gain() for more details. */ virtual float ted_gain() const = 0; @@ -179,7 +179,7 @@ namespace gr { * \brief Returns the PI filter proportional gain, alpha. * * \details - * See the documenation for set_alpha() for more details. + * See the documentation for set_alpha() for more details. */ virtual float alpha() const = 0; @@ -187,7 +187,7 @@ namespace gr { * \brief Returns the PI filter integral gain, beta. * * \details - * See the documenation for set_beta() for more details. + * See the documentation for set_beta() for more details. */ virtual float beta() const = 0; diff --git a/gr-digital/lib/clock_tracking_loop.h b/gr-digital/lib/clock_tracking_loop.h index 1a20713c48..bc4aee1e6a 100644 --- a/gr-digital/lib/clock_tracking_loop.h +++ b/gr-digital/lib/clock_tracking_loop.h @@ -655,7 +655,7 @@ namespace gr { * \brief Returns the normalized approximate loop bandwidth. * * \details - * See the documenation for set_loop_bandwidth() for more details. + * See the documentation for set_loop_bandwidth() for more details. * * Note that if set_alpha() or set_beta() were called to directly * set gains, the value returned by this method will be inaccurate/stale. @@ -666,7 +666,7 @@ namespace gr { * \brief Returns the loop damping factor. * * \details - * See the documenation for set_damping_factor() for more details. + * See the documentation for set_damping_factor() for more details. * * Note that if set_alpha() or set_beta() were called to directly * set gains, the value returned by this method will be inaccurate/stale. @@ -678,7 +678,7 @@ namespace gr { * Detector. * * \details - * See the documenation for set_ted_gain() for more details. + * See the documentation for set_ted_gain() for more details. */ float get_ted_gain() const; @@ -686,7 +686,7 @@ namespace gr { * \brief Returns the PI filter proportional gain, alpha. * * \details - * See the documenation for set_alpha() for more details. + * See the documentation for set_alpha() for more details. */ float get_alpha() const; @@ -694,7 +694,7 @@ namespace gr { * \brief Returns the PI filter integral gain, beta. * * \details - * See the documenation for set_beta() for more details. + * See the documentation for set_beta() for more details. */ float get_beta() const; @@ -748,7 +748,7 @@ namespace gr { * \brief Get the maximum average clock period estimate limit, T_avg_max. * * \details - * See the documenation for set_max_avg_period() for more details. + * See the documentation for set_max_avg_period() for more details. */ float get_max_avg_period() const; @@ -756,7 +756,7 @@ namespace gr { * \brief Get the minimum average clock period estimate limit, T_avg_min. * * \details - * See the documenation for set_min_avg_period() for more details. + * See the documentation for set_min_avg_period() for more details. */ float get_min_avg_period() const; diff --git a/gr-digital/lib/constellation.cc b/gr-digital/lib/constellation.cc index be2b273d6d..a09a9e5fb9 100644 --- a/gr-digital/lib/constellation.cc +++ b/gr-digital/lib/constellation.cc @@ -345,7 +345,7 @@ namespace gr { float xim = branchless_clip(sample.imag(), 0.99); // We normalize the constellation in the ctor, so we know that - // the maximum dimenions go from -1 to +1. We can infer the x + // the maximum dimensions go from -1 to +1. We can infer the x // and y scale directly. float scale = d_lut_scale / (2.0f); diff --git a/gr-digital/lib/interpolating_resampler.h b/gr-digital/lib/interpolating_resampler.h index cdd0d976ea..7630189979 100644 --- a/gr-digital/lib/interpolating_resampler.h +++ b/gr-digital/lib/interpolating_resampler.h @@ -483,7 +483,7 @@ namespace gr { * * \details * This is the complex input, complex output, interpolating resampler - * object with a polyphase filter bank with a user provided protoype + * object with a polyphase filter bank with a user provided prototype * matched filter. The prototype matched filter must be designed at a * rate of nfilts times the output rate. */ @@ -542,7 +542,7 @@ namespace gr { * * \details * This is the float input, float output, interpolating resampler - * object with a polyphase filter bank with a user provided protoype + * object with a polyphase filter bank with a user provided prototype * matched filter. The prototype matched filter must be designed at a * rate of nfilts times the output rate. */ diff --git a/gr-digital/lib/mpsk_receiver_cc_impl.h b/gr-digital/lib/mpsk_receiver_cc_impl.h index 48a9e43e58..efbf8bf6b9 100644 --- a/gr-digital/lib/mpsk_receiver_cc_impl.h +++ b/gr-digital/lib/mpsk_receiver_cc_impl.h @@ -199,7 +199,7 @@ namespace gr { * point to the proper decision function for the specified * constellation order. * - * \return index into d_constellation point that is the closest to the recieved sample + * \return index into d_constellation point that is the closest to the received sample */ unsigned int (mpsk_receiver_cc_impl::*d_decision)(gr_complex sample) const; diff --git a/gr-digital/lib/timing_error_detector.h b/gr-digital/lib/timing_error_detector.h index fd569ba360..ad04d72c2b 100644 --- a/gr-digital/lib/timing_error_detector.h +++ b/gr-digital/lib/timing_error_detector.h @@ -440,12 +440,12 @@ namespace gr { }; /*! - * \brief Signal times Slope Maximum Likelyhood solution approximation + * \brief Signal times Slope Maximum Likelihood solution approximation * timing error detector algorithm class * \ingroup internal * * \details - * This is the Signal times Slope Maximum Likelyhood solution approximation + * This is the Signal times Slope Maximum Likelihood solution approximation * timing error detector algorithm class. This approximation is good for * small signals (< 1.0) and/or situations with low SNR. * @@ -459,7 +459,7 @@ namespace gr { { public: /*! - * \brief Create a Signal times Slope Maximum Likelyhood solution + * \brief Create a Signal times Slope Maximum Likelihood solution * approximation timing error detector */ ted_signal_times_slope_ml() @@ -474,12 +474,12 @@ namespace gr { }; /*! - * \brief Signum times Slope Maximum Likelyhood solution approximation + * \brief Signum times Slope Maximum Likelihood solution approximation * timing error detector algorithm class * \ingroup internal * * \details - * This is the Signum times Slope Maximum Likelyhood solution approximation + * This is the Signum times Slope Maximum Likelihood solution approximation * timing error detector algorithm class. This approximation is good for * large signals (> 1.0) and/or situations with high SNR. * @@ -493,7 +493,7 @@ namespace gr { { public: /*! - * \brief Create a Signum times Slope Maximum Likelyhood solution + * \brief Create a Signum times Slope Maximum Likelihood solution * approximation timing error detector */ ted_signum_times_slope_ml() diff --git a/gr-digital/python/digital/generic_mod_demod.py b/gr-digital/python/digital/generic_mod_demod.py index 1b8e1149c9..b26966fbcf 100644 --- a/gr-digital/python/digital/generic_mod_demod.py +++ b/gr-digital/python/digital/generic_mod_demod.py @@ -81,7 +81,7 @@ def add_common_options(parser): help="Select modulation code from: %s [default=%%default]" % (', '.join(mod_codes.codes),)) parser.add_option("", "--excess-bw", type="float", default=_def_excess_bw, - help="set RRC excess bandwith factor [default=%default]") + help="set RRC excess bandwidth factor [default=%default]") # ///////////////////////////////////////////////////////////////////////////// diff --git a/gr-digital/python/digital/gfsk.py b/gr-digital/python/digital/gfsk.py index 3569ffe6cf..032302b103 100644 --- a/gr-digital/python/digital/gfsk.py +++ b/gr-digital/python/digital/gfsk.py @@ -195,7 +195,7 @@ class gfsk_demod(gr.hier_block2): verbose: Print information about modulator? (bool) log: Print modualtion data to files? (bool) - Clock recovery parameters. These all have reasonble defaults. + Clock recovery parameters. These all have reasonable defaults. Args: gain_mu: controls rate of mu adjustment (float) diff --git a/gr-digital/python/digital/ofdm_sync_pn.py b/gr-digital/python/digital/ofdm_sync_pn.py index 8bf7ed782a..0e79c67ca0 100644 --- a/gr-digital/python/digital/ofdm_sync_pn.py +++ b/gr-digital/python/digital/ofdm_sync_pn.py @@ -39,7 +39,7 @@ class ofdm_sync_pn(gr.hier_block2): """ OFDM synchronization using PN Correlation: T. M. Schmidl and D. C. Cox, "Robust Frequency and Timing - Synchonization for OFDM," IEEE Trans. Communications, vol. 45, + Synchronization for OFDM," IEEE Trans. Communications, vol. 45, no. 12, 1997. """ diff --git a/gr-digital/python/digital/qa_constellation_receiver.py b/gr-digital/python/digital/qa_constellation_receiver.py index 9565c7089e..fc6ea01820 100755 --- a/gr-digital/python/digital/qa_constellation_receiver.py +++ b/gr-digital/python/digital/qa_constellation_receiver.py @@ -110,7 +110,7 @@ class test_constellation_receiver(gr_unittest.TestCase): for req_correct, tcs in requirements: for constellation, differential in tcs: # The constellation_receiver doesn't work for constellations - # of multple dimensions (i.e. multiple complex numbers to a + # of multiple dimensions (i.e. multiple complex numbers to a # single symbol). # That is not implemented since the receiver has no way of # knowing where the beginning of a symbol is. diff --git a/gr-digital/python/digital/qa_ofdm_sync_sc_cfb.py b/gr-digital/python/digital/qa_ofdm_sync_sc_cfb.py index ccb6dff439..1558c5d51f 100755 --- a/gr-digital/python/digital/qa_ofdm_sync_sc_cfb.py +++ b/gr-digital/python/digital/qa_ofdm_sync_sc_cfb.py @@ -68,7 +68,7 @@ class qa_ofdm_sync_sc_cfb (gr_unittest.TestCase): self.assertEqual(numpy.sum(sig2_detect), 1) def test_002_freq (self): - """ Add a fine frequency offset and see if that get's detected properly """ + """ Add a fine frequency offset and see if that gets detected properly """ fft_len = 32 cp_len = 4 # This frequency offset is normalized to rads, i.e. \pi == f_s/2 diff --git a/gr-digital/python/grc_gnuradio/blks2/packet.py b/gr-digital/python/grc_gnuradio/blks2/packet.py index 298453a104..2cdc518777 100644 --- a/gr-digital/python/grc_gnuradio/blks2/packet.py +++ b/gr-digital/python/grc_gnuradio/blks2/packet.py @@ -210,7 +210,7 @@ class packet_mod_base(gr.hier_block2): if not payload_length: #get payload length payload_length = DEFAULT_PAYLOAD_LEN if (payload_length % self._item_size_in) != 0: #verify that packet length is a multiple of the stream size - raise ValueError, 'The payload length: "%d" is not a mutiple of the stream size: "%d".'%(payload_length, self._item_size_in) + raise ValueError, 'The payload length: "%d" is not a multiple of the stream size: "%d".'%(payload_length, self._item_size_in) #initialize hier2 gr.hier_block2.__init__( self, diff --git a/gr-dtv/examples/atsc_ctrlport_monitor.py b/gr-dtv/examples/atsc_ctrlport_monitor.py index 7c43aebb77..25c52afd61 100755 --- a/gr-dtv/examples/atsc_ctrlport_monitor.py +++ b/gr-dtv/examples/atsc_ctrlport_monitor.py @@ -31,7 +31,7 @@ from scipy import fftpack If a host is running the ATSC receiver chain with ControlPort turned on, this script will connect to the host using the hostname and port pair of the ControlPort instance and display metrics of the -receiver. The ATSC publishes information about the succes of the +receiver. The ATSC publishes information about the success of the Reed-Solomon decoder and Viterbi metrics for use here in displaying the link quality. This also gets the equalizer taps of the receiver and displays the frequency response. diff --git a/gr-dtv/lib/atsc/atsc_single_viterbi.cc b/gr-dtv/lib/atsc/atsc_single_viterbi.cc index 011cc0fe96..5f4850d81a 100644 --- a/gr-dtv/lib/atsc/atsc_single_viterbi.cc +++ b/gr-dtv/lib/atsc/atsc_single_viterbi.cc @@ -104,10 +104,10 @@ namespace gr { /* If this is the most probable state so far remember it, this only needs to be checked when we are about to output a path - so this test can be saved till later if needed, if perfomed + so this test can be saved till later if needed, if performed later it could also be optimized with SIMD instructions. Even better this check could be eliminated as we are - outputing the tail of our traceback not the head, for any + outputting the tail of our traceback not the head, for any head state path will tend towards the optimal path with a probability approaching 1 in just 8 or so transitions */ diff --git a/gr-dtv/lib/atsc/atsc_sync_impl.cc b/gr-dtv/lib/atsc/atsc_sync_impl.cc index 7ecc33612a..b4de5fca56 100644 --- a/gr-dtv/lib/atsc/atsc_sync_impl.cc +++ b/gr-dtv/lib/atsc/atsc_sync_impl.cc @@ -178,8 +178,8 @@ namespace gr { // If we are locked we can start filling and producing data packets // Due to the way we lock the first data packet will almost always be - // half full, this is OK becouse the fs_checker will not let packets though - // untill a non-corrupted field packet is found + // half full, this is OK because the fs_checker will not let packets though + // until a non-corrupted field packet is found if( d_seg_locked ) { d_data_mem[d_symbol_index] = interp_sample; diff --git a/gr-dtv/lib/dvbt/dvbt_demod_reference_signals_impl.cc b/gr-dtv/lib/dvbt/dvbt_demod_reference_signals_impl.cc index de82d87fdf..71a50ad2a4 100644 --- a/gr-dtv/lib/dvbt/dvbt_demod_reference_signals_impl.cc +++ b/gr-dtv/lib/dvbt/dvbt_demod_reference_signals_impl.cc @@ -112,7 +112,7 @@ namespace gr { /* * Wait for a sync_start tag from upstream that signals when to start. - * Allways consume until to a superframe start. + * Always consume until to a superframe start. */ if (is_sync_start(noutput_items)) { d_init = 0; diff --git a/gr-dtv/lib/dvbt/dvbt_inner_coder_impl.cc b/gr-dtv/lib/dvbt/dvbt_inner_coder_impl.cc index 0787464aa2..e26c0eb8d9 100644 --- a/gr-dtv/lib/dvbt/dvbt_inner_coder_impl.cc +++ b/gr-dtv/lib/dvbt/dvbt_inner_coder_impl.cc @@ -141,7 +141,7 @@ namespace gr { //Determine m - constellation symbol size d_m = config.d_m; - // In order to accomodate all constalations (m=2,4,6) + // In order to accommodate all constalations (m=2,4,6) // and rates (1/2, 2/3, 3/4, 5/6, 7/8) // We need the following things to happen: // - output item size multiple of 1512bytes diff --git a/gr-dtv/lib/dvbt/dvbt_reference_signals_impl.cc b/gr-dtv/lib/dvbt/dvbt_reference_signals_impl.cc index f92f9fa6d8..c4d85e65ed 100644 --- a/gr-dtv/lib/dvbt/dvbt_reference_signals_impl.cc +++ b/gr-dtv/lib/dvbt/dvbt_reference_signals_impl.cc @@ -1179,7 +1179,7 @@ namespace gr { // - symbol timing (pre-FFT) // - symbol frequency correction (pre-FFT) // - integer frequency correction (post-FFT) - // TODO - call this just in the aquisition mode + // TODO - call this just in the acquisition mode compute_oneshot_csft(in); // Gather all corrections and obtain a corrected OFDM symbol: diff --git a/gr-dtv/lib/dvbt/dvbt_reference_signals_impl.h b/gr-dtv/lib/dvbt/dvbt_reference_signals_impl.h index 7d356203cb..06a74f936c 100644 --- a/gr-dtv/lib/dvbt/dvbt_reference_signals_impl.h +++ b/gr-dtv/lib/dvbt/dvbt_reference_signals_impl.h @@ -190,7 +190,7 @@ namespace gr { void generate_bch_code(); // Verify parity on TPS data int verify_bch_code(std::deque<char> data); - // TPS data processing metods + // TPS data processing methods int process_tps_data(const gr_complex * in, const int diff_symbo_index); // Channel estimation methods diff --git a/gr-dtv/python/dtv/atsc_rx.py b/gr-dtv/python/dtv/atsc_rx.py index 590e5f041c..75c61f43ff 100644 --- a/gr-dtv/python/dtv/atsc_rx.py +++ b/gr-dtv/python/dtv/atsc_rx.py @@ -41,7 +41,7 @@ class atsc_rx(gr.hier_block2): # Normalize signal to proper constellation amplitude agc = analog.agc_ff(1e-5, 4.0) - # Synchronize bit and segement timing + # Synchronize bit and segment timing btl = dtv.atsc_sync(output_rate) # Check for correct field sync diff --git a/gr-fcd/include/gnuradio/fcd/source_c.h b/gr-fcd/include/gnuradio/fcd/source_c.h index 2c68b9b6a6..076b3bf3d5 100644 --- a/gr-fcd/include/gnuradio/fcd/source_c.h +++ b/gr-fcd/include/gnuradio/fcd/source_c.h @@ -32,7 +32,7 @@ namespace gr { * \ingroup fcd_blk * * \details - * This class provides a Funcube Dongle soure block by wrapping + * This class provides a Funcube Dongle source block by wrapping * the USB audio interface and the USB HID control interface of * the Funcube Dongle into one convenient source block. * diff --git a/gr-fcd/lib/fcd/fcd.c b/gr-fcd/lib/fcd/fcd.c index 693f5fb81c..3ef0293d0a 100644 --- a/gr-fcd/lib/fcd/fcd.c +++ b/gr-fcd/lib/fcd/fcd.c @@ -507,7 +507,7 @@ EXTERN FCD_MODE_ENUM fcdBlReset(void) It seems that the read_callback() in hid-libusb.c will never receive any data during the reconfiguration. Since the same logic works in the native windows application, it could be a libusb thing. Anyhow, since the value - returned by this function is not used, we may as well jsut skip the hid_read() + returned by this function is not used, we may as well just skip the hid_read() and return FME_NONE. Correct switch from BL to APP mode can be observed in /var/log/messages (linux) (when in bootloader mode the device version includes 'BL') @@ -680,7 +680,7 @@ EXTERN FCD_MODE_ENUM fcdBlWriteFirmware(char *pc, int64_t n64Size) /** \brief Verify firmware in FCd flash. * \param pc Pointer to firmware data to verify against. * \param n64Size Size of the data in pc. - * \return The FCD_MODE_BL if verification was succesful. + * \return The FCD_MODE_BL if verification was successful. * * This function verifies the firmware currently in the FCd flash against the firmware * image pointed to by pc. The function return FCD_MODE_BL if the verification is OK and diff --git a/gr-fcd/lib/hid/hid-libusb.c b/gr-fcd/lib/hid/hid-libusb.c index 3c6d877f88..85ead96327 100644 --- a/gr-fcd/lib/hid/hid-libusb.c +++ b/gr-fcd/lib/hid/hid-libusb.c @@ -204,7 +204,7 @@ static void free_hid_device(hid_device *dev) } #if 0 -/*TODO: Implement this funciton on hidapi/libusb.. */ +/*TODO: Implement this function on hidapi/libusb.. */ static void register_error(hid_device *device, const char *op) { diff --git a/gr-fcd/lib/hid/hidmac.c b/gr-fcd/lib/hid/hidmac.c index e0756a1588..0471c90724 100644 --- a/gr-fcd/lib/hid/hidmac.c +++ b/gr-fcd/lib/hid/hidmac.c @@ -814,7 +814,7 @@ static int cond_wait(const hid_device *dev, pthread_cond_t *cond, pthread_mutex_ return res; /* A res of 0 means we may have been signaled or it may - be a spurious wakeup. Check to see that there's acutally + be a spurious wakeup. Check to see that there's actually data in the queue before returning, and if not, go back to sleep. See the pthread_cond_timedwait() man page for details. */ @@ -834,7 +834,7 @@ static int cond_timedwait(const hid_device *dev, pthread_cond_t *cond, pthread_m return res; /* A res of 0 means we may have been signaled or it may - be a spurious wakeup. Check to see that there's acutally + be a spurious wakeup. Check to see that there's actually data in the queue before returning, and if not, go back to sleep. See the pthread_cond_timedwait() man page for details. */ diff --git a/gr-fcd/lib/source_c_impl.cc b/gr-fcd/lib/source_c_impl.cc index fddd05687c..621c1d7767 100644 --- a/gr-fcd/lib/source_c_impl.cc +++ b/gr-fcd/lib/source_c_impl.cc @@ -47,7 +47,7 @@ namespace gr { (new source_c_impl(device_name)); } - static const int MIN_IN = 0; /*!< Mininum number of input streams. */ + static const int MIN_IN = 0; /*!< Minimum number of input streams. */ static const int MAX_IN = 0; /*!< Maximum number of input streams. */ static const int MIN_OUT = 1; /*!< Minimum number of output streams. */ static const int MAX_OUT = 1; /*!< Maximum number of output streams. */ diff --git a/gr-fec/grc/fec_decoder.xml b/gr-fec/grc/fec_decoder.xml index dd9d08d5f6..fffa4020e9 100644 --- a/gr-fec/grc/fec_decoder.xml +++ b/gr-fec/grc/fec_decoder.xml @@ -85,7 +85,7 @@ </source> <doc> - This is a GNU Radio adaptor for any FEC decoder following the generic_decoder API in the fec module. Input and output are flexible to accomodate decoders that, say, modulate their encoded results into complex or float types. + This is a GNU Radio adaptor for any FEC decoder following the generic_decoder API in the fec module. Input and output are flexible to accommodate decoders that, say, modulate their encoded results into complex or float types. </doc> </block>
\ No newline at end of file diff --git a/gr-fec/grc/fec_encoder.xml b/gr-fec/grc/fec_encoder.xml index defb7c3b46..cfc0a7708a 100644 --- a/gr-fec/grc/fec_encoder.xml +++ b/gr-fec/grc/fec_encoder.xml @@ -85,7 +85,7 @@ </source> <doc> - This is a GNU Radio adaptor for any FEC encoder following the generic_encoder API in the fec module. Input and output are flexible to accomodate encoders that, say, modulate their encoded results into complex or float types. + This is a GNU Radio adaptor for any FEC encoder following the generic_encoder API in the fec module. Input and output are flexible to accommodate encoders that, say, modulate their encoded results into complex or float types. </doc> </block>
\ No newline at end of file diff --git a/gr-fec/grc/ldpc_decoder_def_list.xml b/gr-fec/grc/ldpc_decoder_def_list.xml index 007f85505c..3d62f4a815 100644 --- a/gr-fec/grc/ldpc_decoder_def_list.xml +++ b/gr-fec/grc/ldpc_decoder_def_list.xml @@ -13,7 +13,7 @@ self.$(id) = $(id) = map( (lambda b: map( ( lambda a: fec.ldpc_decoder.make($fil #end if</var_make> <make></make> -<!-- This definition below is wierd, it seems required for the GRC to be happy, im confused --> +<!-- This definition below is weird, it seems required for the GRC to be happy, I'm confused. --> <param> <name>Ignore Me</name> <key>value</key> diff --git a/gr-fec/grc/tpc_decoder_def_list.xml b/gr-fec/grc/tpc_decoder_def_list.xml index aac08dbb76..6436848a0f 100644 --- a/gr-fec/grc/tpc_decoder_def_list.xml +++ b/gr-fec/grc/tpc_decoder_def_list.xml @@ -13,7 +13,7 @@ self.$(id) = $(id) = map( (lambda b: map( ( lambda a: fec.tpc_decoder_make($row_ #end if</var_make> <make></make> -<!-- This definition below is wierd, it seems required for the GRC to be happy, im confused --> +<!-- This definition below is weird, it seems required for the GRC to be happy, I'm confused. --> <param> <name>Ignore Me</name> <key>value</key> diff --git a/gr-fec/grc/tpc_encoder_def_list.xml b/gr-fec/grc/tpc_encoder_def_list.xml index c035795b58..20a3e3e733 100755 --- a/gr-fec/grc/tpc_encoder_def_list.xml +++ b/gr-fec/grc/tpc_encoder_def_list.xml @@ -13,7 +13,7 @@ self.$(id) = $(id) = map( (lambda b: map( ( lambda a: fec.tpc_encoder_make($row_ #end if</var_make> <make></make> -<!-- This definition below is wierd, it seems required for the GRC to be happy, im confused --> +<!-- This definition below is weird, it seems required for the GRC to be happy, I'm confused. --> <param> <name>Ignore Me</name> <key>value</key> diff --git a/gr-fec/include/gnuradio/fec/alist.h b/gr-fec/include/gnuradio/fec/alist.h index 85f6a79cd7..e68a88cd4e 100644 --- a/gr-fec/include/gnuradio/fec/alist.h +++ b/gr-fec/include/gnuradio/fec/alist.h @@ -57,7 +57,7 @@ class FEC_API alist //! Write alist data to a file void write(const char * fname) const; - //! Retuns N, the number of variable nodes + //! Returns N, the number of variable nodes int get_N(); //! Return M, the number of check nodes diff --git a/gr-fec/include/gnuradio/fec/ccsds_encoder.h b/gr-fec/include/gnuradio/fec/ccsds_encoder.h index 9fa364a42e..f482ad90f7 100644 --- a/gr-fec/include/gnuradio/fec/ccsds_encoder.h +++ b/gr-fec/include/gnuradio/fec/ccsds_encoder.h @@ -46,7 +46,7 @@ namespace gr { * where we can set the rate, constraint length, and polynomial, * see gr::fec::code::cc_encoder. * - * The encoder is set up wtih a number of bits per frame in the + * The encoder is set up with a number of bits per frame in the * constructor. When not being used in a tagged stream mode, * this encoder will only process frames of the length provided * here. If used in a tagged stream block, this setting becomes diff --git a/gr-fec/include/gnuradio/fec/dummy_encoder.h b/gr-fec/include/gnuradio/fec/dummy_encoder.h index cd38d747f7..b0aa704c8b 100644 --- a/gr-fec/include/gnuradio/fec/dummy_encoder.h +++ b/gr-fec/include/gnuradio/fec/dummy_encoder.h @@ -61,7 +61,7 @@ namespace gr { * handled. If set to True, the encoder's * get_output_conversion returns 'packed_bits', meaning * that the output data of the encoder is packed and - * should be unpacked. Generally handled throug an + * should be unpacked. Generally handled through an * extended encoder interface. */ static generic_encoder::sptr make(int frame_size, bool pack = false, diff --git a/gr-fec/include/gnuradio/fec/polar_common.h b/gr-fec/include/gnuradio/fec/polar_common.h index 99c7d84e55..229dc70e2e 100644 --- a/gr-fec/include/gnuradio/fec/polar_common.h +++ b/gr-fec/include/gnuradio/fec/polar_common.h @@ -45,7 +45,7 @@ namespace gr { * * \details * Polar codes are based on this paper by Erdal Arikan "Channel - * Polarization: A Method for Contructing Capacity-Achieving Codes + * Polarization: A Method for Constructing Capacity-Achieving Codes * for Symmetric Binary-Input Memoryless Channels", 2009 block * holds common information for encoders and decoders. All polar * encoder/decoders inherit from polar_common. diff --git a/gr-fec/lib/conv_bit_corr_bb_impl.cc b/gr-fec/lib/conv_bit_corr_bb_impl.cc index 48de06157b..7c514168f4 100644 --- a/gr-fec/lib/conv_bit_corr_bb_impl.cc +++ b/gr-fec/lib/conv_bit_corr_bb_impl.cc @@ -66,7 +66,7 @@ namespace gr { // d_msgrecv_rpc(alias(), "messages_recieved", &d_msgrecv, // pmt::mp(0), pmt::mp(65536), pmt::mp(0), -// "messages", "Asynch Messages Recieved", +// "messages", "Asynch Messages Received", // RPC_PRIVLVL_MIN, DISPTIME | DISPOPTSTRIP), // d_msgsent_rpc(alias(), "messages_sent", &d_msgsent, // pmt::mp(0), pmt::mp(65536), pmt::mp(0), diff --git a/gr-fec/lib/reed-solomon/CMakeLists.txt b/gr-fec/lib/reed-solomon/CMakeLists.txt index 0858a670c5..e7ec781991 100644 --- a/gr-fec/lib/reed-solomon/CMakeLists.txt +++ b/gr-fec/lib/reed-solomon/CMakeLists.txt @@ -20,7 +20,7 @@ ######################################################################## # This file included, use CMake directory variables ######################################################################## -#MSVC workaround: we cant have dynamically sized arrays. +#MSVC workaround: we can't have dynamically sized arrays. #So ifdef a max array bounds that is larger than NN and NROOTS #Its a bit of a hack, but if you look at the code, its so full of ifdefs, #and lacks optimization where it should be pre-allocating these arrays. diff --git a/gr-fec/lib/tpc_decoder.cc b/gr-fec/lib/tpc_decoder.cc index b3fbcc92df..3381d55dc8 100644 --- a/gr-fec/lib/tpc_decoder.cc +++ b/gr-fec/lib/tpc_decoder.cc @@ -126,7 +126,7 @@ tpc_decoder::tpc_decoder (std::vector<int> row_polys, std::vector<int> col_polys } // declare the reverse sweep trellis - // the beta vector is logically layed out in memory as follows, assuming the + // the beta vector is logically laid out in memory as follows, assuming the // following values (for educational purposes) // defined: LL = 6, rowEncoder_K = 3, derived: mm_row=2, max_states_row=4, rowEncoder_n=1, num_symbols_row=2 // state_idx @@ -301,7 +301,7 @@ void tpc_decoder::siso_decode_row() { num_llr_u = -MAXLOG; den_llr_u = -MAXLOG; - // intialize alpha_row + // initialize alpha_row // for (state=0;state<max_states_row;state++) { // alpha_row[state] = -MAXLOG; // } @@ -510,7 +510,7 @@ void tpc_decoder::siso_decode_col() { num_llr_u = -MAXLOG; den_llr_u = -MAXLOG; - // intialize alpha_col + // initialize alpha_col // for (state=0;state<max_states_col;state++) { // alpha_col[state] = -MAXLOG; // } diff --git a/gr-fec/lib/tpc_encoder.cc b/gr-fec/lib/tpc_encoder.cc index 849205753e..c9d89d7531 100755 --- a/gr-fec/lib/tpc_encoder.cc +++ b/gr-fec/lib/tpc_encoder.cc @@ -249,7 +249,7 @@ void tpc_encoder::generic_work(void *inBuffer, void *outBuffer) { for(ii=0; ii<numCheckColsToEncode; ii++) { // populate colToEncode for(jj=0; jj<d_kcol; jj++) { - colToEncode[jj] = rowEncodedBits[jj][ii]; // indexing is wierd b/c of the way we declared the vector :( + colToEncode[jj] = rowEncodedBits[jj][ii]; // indexing is weird b/c of the way we declared the vector :( } //DEBUG_PRINT("Encoding col=[%d] -->\n",ii+numDataColsToEncode); diff --git a/gr-fec/python/fec/LDPC/Generate_LDPC_matrix_functions.py b/gr-fec/python/fec/LDPC/Generate_LDPC_matrix_functions.py index c42fee631f..589595bbd5 100644 --- a/gr-fec/python/fec/LDPC/Generate_LDPC_matrix_functions.py +++ b/gr-fec/python/fec/LDPC/Generate_LDPC_matrix_functions.py @@ -55,7 +55,7 @@ def read_alist_file(filename): def write_alist_file(filename, H, verbose=0): """ This function writes an alist file for the parity check - matrix. The format of alist files is desribed at: + matrix. The format of alist files is described at: http://www.inference.phy.cam.ac.uk/mackay/codes/alist.html """ diff --git a/gr-fec/python/fec/polar/channel_construction_bec.py b/gr-fec/python/fec/polar/channel_construction_bec.py index 4b35602d96..acad720036 100644 --- a/gr-fec/python/fec/polar/channel_construction_bec.py +++ b/gr-fec/python/fec/polar/channel_construction_bec.py @@ -27,7 +27,7 @@ def bec_channel(eta): binary erasure channel (BEC) for each y e Y W(y|0) * W(y|1) = 0 or W(y|0) = W(y|1) - transistions are 1 -> 1 or 0 -> 0 or {0, 1} -> ? (erased symbol) + transitions are 1 -> 1 or 0 -> 0 or {0, 1} -> ? (erased symbol) ''' # looks like BSC but should be interpreted differently. w = np.array((1 - eta, eta, 1 - eta), dtype=float) diff --git a/gr-fec/python/fec/polar/helper_functions.py b/gr-fec/python/fec/polar/helper_functions.py index 85140c856f..a4ecb1f0ff 100644 --- a/gr-fec/python/fec/polar/helper_functions.py +++ b/gr-fec/python/fec/polar/helper_functions.py @@ -30,7 +30,7 @@ def bsc_channel(p): W(0|0) = W(1|1) and W(1|0) = W(0|1) this function returns a prob's vector for a BSC - p denotes an erroneous transistion + p denotes an erroneous transition ''' if not (p >= 0.0 and p <= 1.0): print "given p is out of range!" diff --git a/gr-filter/docs/filter.dox b/gr-filter/docs/filter.dox index e598d683f1..674e1e3c5a 100644 --- a/gr-filter/docs/filter.dox +++ b/gr-filter/docs/filter.dox @@ -157,7 +157,7 @@ with added argument to set the out-of-band attenuation (in dB). \li gr::filter::firdes::root_raised_cosine: creates a root raised cosine (RRC) pulse shaping filter. -\li gr::filter::firdes::guassian: creates a Gaussian pulse shaping +\li gr::filter::firdes::gaussian: creates a Gaussian pulse shaping filter. \li gr::filter::firdes::window: Returns the window function for the diff --git a/gr-filter/examples/gr_filtdes_api.py b/gr-filter/examples/gr_filtdes_api.py index 6d7716ce49..9e9cb1df49 100755 --- a/gr-filter/examples/gr_filtdes_api.py +++ b/gr-filter/examples/gr_filtdes_api.py @@ -30,7 +30,7 @@ returns b,a for IIR filter design ''' filtobj = filter_design.launch(sys.argv) -# Displaying all filter paramters +# Displaying all filter parameters print "Filter Count:", filtobj.get_filtercount() print "Filter type:", filtobj.get_restype() print "Filter params", filtobj.get_params() diff --git a/gr-filter/grc/filter_band_pass_filter.xml b/gr-filter/grc/filter_band_pass_filter.xml index c4c1852481..f486e5e0cf 100644 --- a/gr-filter/grc/filter_band_pass_filter.xml +++ b/gr-filter/grc/filter_band_pass_filter.xml @@ -161,6 +161,6 @@ This filter is a convenience wrapper for an fir filter and a firdes taps generat Sample rate, cutoff frequency, and transition width are in Hertz. -The beta paramater only applies to the Kaiser window. +The beta parameter only applies to the Kaiser window. </doc> </block> diff --git a/gr-filter/grc/filter_band_reject_filter.xml b/gr-filter/grc/filter_band_reject_filter.xml index a506789627..cb6fa8737a 100644 --- a/gr-filter/grc/filter_band_reject_filter.xml +++ b/gr-filter/grc/filter_band_reject_filter.xml @@ -127,6 +127,6 @@ This filter is a convenience wrapper for an fir filter and a firdes taps generat Sample rate, cutoff frequency, and transition width are in Hertz. -The beta paramater only applies to the Kaiser window. +The beta parameter only applies to the Kaiser window. </doc> </block> diff --git a/gr-filter/grc/filter_high_pass_filter.xml b/gr-filter/grc/filter_high_pass_filter.xml index 6b041145d5..a456a9da95 100644 --- a/gr-filter/grc/filter_high_pass_filter.xml +++ b/gr-filter/grc/filter_high_pass_filter.xml @@ -122,6 +122,6 @@ This filter is a convenience wrapper for an fir filter and a firdes taps generat Sample rate, cutoff frequency, and transition width are in Hertz. -The beta paramater only applies to the Kaiser window. +The beta parameter only applies to the Kaiser window. </doc> </block> diff --git a/gr-filter/grc/filter_low_pass_filter.xml b/gr-filter/grc/filter_low_pass_filter.xml index 66d15bb592..bc3fdefd8c 100644 --- a/gr-filter/grc/filter_low_pass_filter.xml +++ b/gr-filter/grc/filter_low_pass_filter.xml @@ -122,6 +122,6 @@ This filter is a convenience wrapper for an fir filter and a firdes taps generat Sample rate, cutoff frequency, and transition width are in Hertz. -The beta paramater only applies to the Kaiser window. +The beta parameter only applies to the Kaiser window. </doc> </block> diff --git a/gr-filter/grc/filter_low_pass_xlating_filter.xml b/gr-filter/grc/filter_low_pass_xlating_filter.xml index 65d5e5bff6..bf7a83beb3 100644 --- a/gr-filter/grc/filter_low_pass_xlating_filter.xml +++ b/gr-filter/grc/filter_low_pass_xlating_filter.xml @@ -139,6 +139,6 @@ This filter is a convenience wrapper for an xlating fir filter and a firdes taps Sample rate, cutoff frequency, and transition width are in Hertz. -The beta paramater only applies to the Kaiser window. +The beta parameter only applies to the Kaiser window. </doc> </block> diff --git a/gr-filter/grc/variable_band_pass_filter_taps.xml b/gr-filter/grc/variable_band_pass_filter_taps.xml index 6cdfcc0373..156f302625 100644 --- a/gr-filter/grc/variable_band_pass_filter_taps.xml +++ b/gr-filter/grc/variable_band_pass_filter_taps.xml @@ -92,6 +92,6 @@ self.$(id) = $(id) = firdes.$(type.fcn)($gain, $samp_rate, $low_cutoff_freq, $hi <doc> This is a convenience wrapper for calling firdes.band_pass() or firdes.complex_band_pass() - The beta paramater only applies to the Kaiser window. + The beta parameter only applies to the Kaiser window. </doc> </block> diff --git a/gr-filter/grc/variable_band_reject_filter_taps.xml b/gr-filter/grc/variable_band_reject_filter_taps.xml index fbf25886d3..941b6f4500 100644 --- a/gr-filter/grc/variable_band_reject_filter_taps.xml +++ b/gr-filter/grc/variable_band_reject_filter_taps.xml @@ -76,6 +76,6 @@ self.$(id) = $(id) = firdes.band_reject($gain, $samp_rate, $low_cutoff_freq, $hi <doc> This is a convenience wrapper for calling firdes.band_reject(). - The beta paramater only applies to the Kaiser window. + The beta parameter only applies to the Kaiser window. </doc> </block> diff --git a/gr-filter/grc/variable_high_pass_filter_taps.xml b/gr-filter/grc/variable_high_pass_filter_taps.xml index 08768d808a..ecf5fe1caa 100644 --- a/gr-filter/grc/variable_high_pass_filter_taps.xml +++ b/gr-filter/grc/variable_high_pass_filter_taps.xml @@ -70,6 +70,6 @@ self.$(id) = $(id) = firdes.high_pass($gain, $samp_rate, $cutoff_freq, $width, $ <doc> This variable is a convenience wrapper around a call to firdes.high_pass(...). - The beta paramater only applies to the Kaiser window. + The beta parameter only applies to the Kaiser window. </doc> </block> diff --git a/gr-filter/grc/variable_low_pass_filter_taps.xml b/gr-filter/grc/variable_low_pass_filter_taps.xml index e3367b1ec5..57cb6f16e3 100644 --- a/gr-filter/grc/variable_low_pass_filter_taps.xml +++ b/gr-filter/grc/variable_low_pass_filter_taps.xml @@ -70,6 +70,6 @@ self.$(id) = $(id) = firdes.low_pass($gain, $samp_rate, $cutoff_freq, $width, $w <doc> This variable is a convenience wrapper around a call to firdes.low_pass(...). - The beta paramater only applies to the Kaiser window. + The beta parameter only applies to the Kaiser window. </doc> </block> diff --git a/gr-filter/include/gnuradio/filter/mmse_fir_interpolator_cc.h b/gr-filter/include/gnuradio/filter/mmse_fir_interpolator_cc.h index 84d91d52d4..d61e360c5e 100644 --- a/gr-filter/include/gnuradio/filter/mmse_fir_interpolator_cc.h +++ b/gr-filter/include/gnuradio/filter/mmse_fir_interpolator_cc.h @@ -35,7 +35,7 @@ namespace gr { * \ingroup filter_primitive * * \details - * This implements a Mininum Mean Squared Error interpolator with + * This implements a Minimum Mean Squared Error interpolator with * 8 taps. It is suitable for signals where the bandwidth of * interest B = 1/(4*Ts) Where Ts is the time between samples. * diff --git a/gr-filter/include/gnuradio/filter/mmse_fir_interpolator_ff.h b/gr-filter/include/gnuradio/filter/mmse_fir_interpolator_ff.h index a69315b3d9..8bc8307eae 100644 --- a/gr-filter/include/gnuradio/filter/mmse_fir_interpolator_ff.h +++ b/gr-filter/include/gnuradio/filter/mmse_fir_interpolator_ff.h @@ -35,7 +35,7 @@ namespace gr { * \ingroup filter_primitive * * \details - * This implements a Mininum Mean Squared Error interpolator with + * This implements a Minimum Mean Squared Error interpolator with * 8 taps. It is suitable for signals where the bandwidth of * interest B = 1/(4*Ts) Where Ts is the time between samples. * diff --git a/gr-filter/include/gnuradio/filter/mmse_interp_differentiator_cc.h b/gr-filter/include/gnuradio/filter/mmse_interp_differentiator_cc.h index 5170264b2f..b323815efd 100644 --- a/gr-filter/include/gnuradio/filter/mmse_interp_differentiator_cc.h +++ b/gr-filter/include/gnuradio/filter/mmse_interp_differentiator_cc.h @@ -36,7 +36,7 @@ namespace gr { * \ingroup filter_primitive * * \details - * This implements a Mininum Mean Squared Error interpolating + * This implements a Minimum Mean Squared Error interpolating * differentiator with 8 taps. It is suitable for signals where the * derivative of a signal has a bandwidth of interest in the range * (-Fs/4, Fs/4), where Fs is the samples rate. diff --git a/gr-filter/include/gnuradio/filter/mmse_interp_differentiator_ff.h b/gr-filter/include/gnuradio/filter/mmse_interp_differentiator_ff.h index eb176cd753..3fcfce6972 100644 --- a/gr-filter/include/gnuradio/filter/mmse_interp_differentiator_ff.h +++ b/gr-filter/include/gnuradio/filter/mmse_interp_differentiator_ff.h @@ -35,7 +35,7 @@ namespace gr { * \ingroup filter_primitive * * \details - * This implements a Mininum Mean Squared Error interpolating + * This implements a Minimum Mean Squared Error interpolating * differentiator with 8 taps. It is suitable for signals where the * derivative of a signal has a bandwidth of interest in the range * (-Fs/4, Fs/4), where Fs is the samples rate. diff --git a/gr-filter/python/filter/design/api_object.py b/gr-filter/python/filter/design/api_object.py index 7661265c75..013ea56ed2 100644 --- a/gr-filter/python/filter/design/api_object.py +++ b/gr-filter/python/filter/design/api_object.py @@ -21,7 +21,7 @@ class ApiObject(): ''' Filter count variable if the filter design tool has to - return multiple filter paramters in future + return multiple filter parameters in future e.g Cascaded Filters ''' def __init__(self, filtcount = 1): diff --git a/gr-filter/python/filter/gui/polezero_plot.py b/gr-filter/python/filter/gui/polezero_plot.py index 8f35dc8d78..f9c88947cb 100644 --- a/gr-filter/python/filter/gui/polezero_plot.py +++ b/gr-filter/python/filter/gui/polezero_plot.py @@ -336,7 +336,7 @@ class CanvasPicker(Qt.QObject): if(self.__selectedPoint != -1): xData=delete(xData, self.__selectedPoint) yData=delete(yData, self.__selectedPoint) - #one less to accomodate previous delete + #one less to accommodate previous delete if(self.__selectedcPoint != -1): xData=delete(xData, self.__selectedcPoint-1) yData=delete(yData, self.__selectedcPoint-1) diff --git a/gr-filter/python/filter/optfir.py b/gr-filter/python/filter/optfir.py index 8ef2a06732..998a652386 100644 --- a/gr-filter/python/filter/optfir.py +++ b/gr-filter/python/filter/optfir.py @@ -297,7 +297,7 @@ def lporder (freq1, freq2, delta_p, delta_s): deviation (ripple), delta_s is the stopband deviation (ripple). Note, this works for high pass filters too (freq1 > freq2), but - doesnt work well if the transition is near f == 0 or f == fs/2 + doesn't work well if the transition is near f == 0 or f == fs/2 From Herrmann et al (1973), Practical design rules for optimum finite impulse response filters. Bell System Technical J., 52, 769-99 diff --git a/gr-qtgui/docs/qtgui.dox b/gr-qtgui/docs/qtgui.dox index 8cbbd7367a..aa7a32879a 100644 --- a/gr-qtgui/docs/qtgui.dox +++ b/gr-qtgui/docs/qtgui.dox @@ -236,7 +236,7 @@ The QTGUI component also includes a number of widgets that can be used to perform live updates of variables through standard QT input widgets. Most of the widgets are implemented directly in Python through PyQT. However, GNU Radio is introducing more widgets, written -and therefore available in C++ that also produce messsages. The +and therefore available in C++ that also produce messages. The Python-based widgets only act as variables and so as they are changed, any block using those widgets to set parameters has the callback (i.e., set_value()) function's called. diff --git a/gr-qtgui/lib/SpectrumGUIClass.cc b/gr-qtgui/lib/SpectrumGUIClass.cc index cf7c728251..be9989526b 100644 --- a/gr-qtgui/lib/SpectrumGUIClass.cc +++ b/gr-qtgui/lib/SpectrumGUIClass.cc @@ -252,7 +252,7 @@ SpectrumGUIClass::updateWindow(const bool updateDisplayFlag, //ALL OF THIS SHIT SHOULD BE COMBINED WITH THE FFTSHIFT //USE VOLK_32FC_DEINTERLEAVE_64F_X2_A TO GET REAL/IMAG FROM COMPLEX32 - // Can't do a memcpy since ths is going from float to double data type + // Can't do a memcpy since this is going from float to double data type if((realTimeDomainData != NULL) && (realTimeDomainDataSize > 0)){ const float* realTimeDomainDataPtr = realTimeDomainData; diff --git a/gr-qtgui/lib/freqdisplayform.cc b/gr-qtgui/lib/freqdisplayform.cc index 6aa4894a96..832a16c783 100644 --- a/gr-qtgui/lib/freqdisplayform.cc +++ b/gr-qtgui/lib/freqdisplayform.cc @@ -535,7 +535,7 @@ FreqDisplayForm::getTriggerTagKey() const /******************************************************************** - * Notifcation messages from the control panel + * Notification messages from the control panel *******************************************************************/ diff --git a/gr-qtgui/lib/timedisplayform.cc b/gr-qtgui/lib/timedisplayform.cc index 2e03e67b3f..726944101d 100644 --- a/gr-qtgui/lib/timedisplayform.cc +++ b/gr-qtgui/lib/timedisplayform.cc @@ -525,7 +525,7 @@ TimeDisplayForm::getTriggerTagKey() const /******************************************************************** - * Notifcation messages from the control panel + * Notification messages from the control panel *******************************************************************/ void diff --git a/gr-qtgui/lib/waterfalldisplayform.cc b/gr-qtgui/lib/waterfalldisplayform.cc index b6eb345bba..a284c5233a 100644 --- a/gr-qtgui/lib/waterfalldisplayform.cc +++ b/gr-qtgui/lib/waterfalldisplayform.cc @@ -358,7 +358,7 @@ void WaterfallDisplayForm::setUpdateTime(double t) { d_update_time = t; - // Assume times are equal unless explictly told by setTimePerFFT() + // Assume times are equal unless explicitly told by setTimePerFFT() // This is the case when plotting using gr_spectrogram_plot d_time_per_fft = t; } diff --git a/gr-trellis/docs/gr-trellis.xml b/gr-trellis/docs/gr-trellis.xml index aabf9ad535..8bddda7290 100644 --- a/gr-trellis/docs/gr-trellis.xml +++ b/gr-trellis/docs/gr-trellis.xml @@ -52,7 +52,7 @@ convolutional code (CC), a trellis code (TC), an inter-symbol interference (ISI) channel, or any other communication system that can be modeled with an FSM. -To achieve this goal, we need to separate the pure FSM descrition from the +To achieve this goal, we need to separate the pure FSM description from the rest of the model details. For instance, in the case of a rate 2/3 TC, the FSM should not involve details about the modulation used (it can be an 8-ary PAM, or 8-PSK, etc). Similarly, when attempting maximum likelihood @@ -272,7 +272,7 @@ y<subscript>j</subscript> (e.g., in the above example y<subscript>j</subscript>( <listitem> <para> -The fourth way is specific to FSMs resulting from shift registers, and the output symbol being the entire transition (ie, current_state and current_input). These FSMs are usefull when describibg ISI channels. In particular the state is comprised of the input symbols x(k-1), x(k-2),...,x(k-L), where L = ch_length-1 and each x(i) belongs to an alphabet of size mod_size. The output is taken to be x(k), x(k-1), x(k-2),...,x(k-L) (in decimal format) +The fourth way is specific to FSMs resulting from shift registers, and the output symbol being the entire transition (ie, current_state and current_input). These FSMs are useful when describibg ISI channels. In particular the state is comprised of the input symbols x(k-1), x(k-2),...,x(k-L), where L = ch_length-1 and each x(i) belongs to an alphabet of size mod_size. The output is taken to be x(k), x(k-1), x(k-2),...,x(k-L) (in decimal format) </para> <programlisting> fsm(const int mod_size, const int ch_length); @@ -393,7 +393,7 @@ evaluates ||r<subscript>k</subscript>-c<subscript>i</subscript>||<superscript>2</superscript> = sum<subscript>j=1</subscript><superscript>D</superscript> |r<subscript>k,j</subscript>-c<subscript>i,j</subscript>|<superscript>2</superscript> </para> <para> -for each of the O hypothesized ouput +for each of the O hypothesized output symbols c<subscript>i</subscript> = (c<subscript>i,1</subscript>,c<subscript>i,2</subscript>,...,c<subscript>i,D</subscript>) defined in the vector TABLE, where TABLE[i * D + j] = c<subscript>i,j</subscript>. </para></listitem> @@ -446,7 +446,7 @@ d<subscript>i</subscript> is the bitwise Hamming distance between i and i<subsc Although the separation of metric calculation and Viterbi algorithm blocks is consistent with our goal of providing general blocks that can be easily reused, this separation might result in large input/output buffer sizes -betwen blocks. Indeed for an FSM with a large output alphabet, the +between blocks. Indeed for an FSM with a large output alphabet, the output of the metric block/input of the Viterbi block is FSM.O( ) floats for each trellis step. Sometimes this results in buffer overflow even for moderate sequence lengths. @@ -522,7 +522,7 @@ symbols that will drive the FSM encoder. <para> -The FSM will produce K output symbols (remeber the FSM produces always one output symbol for each input symbol). Each of these symbols needs to be modulated. Since we are simulating the communication system, we need not simulate the actual waveforms. An M-ary, D-dimensional +The FSM will produce K output symbols (remember the FSM produces always one output symbol for each input symbol). Each of these symbols needs to be modulated. Since we are simulating the communication system, we need not simulate the actual waveforms. An M-ary, D-dimensional modulation is completely specified by a set of M, D-dimensional real vectors. In "fsm_utils.py" file we give a number of useful modulations with the following format: modulation = (D,constellation), where constellation=[c11,c12,...,c1D,c21,c22,...,c2D,...,cM1,cM2,...cMD]. The meaning of the above is that every constellation point c_i @@ -882,7 +882,7 @@ Although these can be generated by existing gr-trellis blocks (in particular, the SISO blocks, as done in some of the python examples) there is an advantage in having this functionality as a single block. To see why, think of a turbo decoder with 10 iterations. Previously we needed to concatenate 10 x 2 SISO blocks (for a sccc decoder) to emulate the passing of soft information between SISOs over 10 iterartions. With the new block however, only a single such block is needed that internally loops through 10 iterations; this results in space savings -and possibly time saving as well (since queueing at the input/ouput of the gr-blocks is avoided). +and possibly time saving as well (since queueing at the input/output of the gr-blocks is avoided). Still need to document them... diff --git a/gr-trellis/examples/python/fsm_files/awgn2o3_4.fsm b/gr-trellis/examples/python/fsm_files/awgn2o3_4.fsm index 3ac57be18d..86a110a829 100644 --- a/gr-trellis/examples/python/fsm_files/awgn2o3_4.fsm +++ b/gr-trellis/examples/python/fsm_files/awgn2o3_4.fsm @@ -10,6 +10,6 @@ 5 2 1 6 6 1 2 5 -I don't remeber how I generated this one... +I don't remember how I generated this one... it is a bit better than awgn2o3_4_msb and worse than awgn2o3_4_msbG. diff --git a/gr-trellis/include/gnuradio/trellis/fsm.h b/gr-trellis/include/gnuradio/trellis/fsm.h index 5ba4483b97..672a33403a 100644 --- a/gr-trellis/include/gnuradio/trellis/fsm.h +++ b/gr-trellis/include/gnuradio/trellis/fsm.h @@ -165,7 +165,7 @@ namespace gr { fsm(const fsm &FSMo, const fsm &FSMi, bool serial); /*! - * \brief Creates an FSMS representing n stages through the originial FSM (AKA radix-n FSM). + * \brief Creates an FSMS representing n stages through the original FSM (AKA radix-n FSM). * * \param FSM Original FSMs * \param n Number of stages. diff --git a/gr-trellis/lib/permutation_impl.cc b/gr-trellis/lib/permutation_impl.cc index 2fe0ea8cb8..5a212a01a7 100644 --- a/gr-trellis/lib/permutation_impl.cc +++ b/gr-trellis/lib/permutation_impl.cc @@ -92,7 +92,7 @@ namespace gr { // per stream processing for(int i = 0; i < noutput_items/d_SYMS_PER_BLOCK; i++) { // Index i refers to blocks. - // Begining of packet (in blocks) + // Beginning of packet (in blocks) int i0 = d_K*(i/d_K); // position of block within packet (in blocks) int j0 = i%d_K; diff --git a/gr-trellis/python/trellis/qa_trellis.py b/gr-trellis/python/trellis/qa_trellis.py index 86c740a730..0ed802a0fd 100755 --- a/gr-trellis/python/trellis/qa_trellis.py +++ b/gr-trellis/python/trellis/qa_trellis.py @@ -77,7 +77,7 @@ class test_trellis (gr_unittest.TestCase): noise = 0.1 tb = trellis_tb(constellation, fsms, noise) tb.run() - # Make sure all packets succesfully transmitted. + # Make sure all packets successfully transmitted. self.assertEqual(tb.dst.ntotal(), tb.dst.nright()) diff --git a/gr-uhd/apps/hf_explorer/hfx_help b/gr-uhd/apps/hf_explorer/hfx_help index c8fa28dbd1..afda669fca 100644 --- a/gr-uhd/apps/hf_explorer/hfx_help +++ b/gr-uhd/apps/hf_explorer/hfx_help @@ -76,9 +76,9 @@ to rapidly switch to the center of that band. To change a band, type the frequency in Hz into the box under "Center Frequency", then press "Set" on the left, then the button you want to - program. From then on (untill the program is exited) pushing + program. From then on (until the program is exited) pushing that button takes you to that band. To make a band button - permenant edit the hfx.py script with whatever frequency you + permanent edit the hfx.py script with whatever frequency you want assigned to what button. @@ -101,7 +101,7 @@ Volume: Move the volume slider with the mouse, or push the Powermate knob - untill the volume button is active, or click on the volume button, + until the volume button is active, or click on the volume button, then turn the knob. Volume can also be set by web control if web control is setup and enabled. @@ -169,7 +169,7 @@ There is a provision for outputting un-demodulated complex through the audio out in stereo for use with Digital Radio - Mondial (DRM) or using a seperate demodulation program like + Mondial (DRM) or using a separate demodulation program like SDRadio (by I2PHD). Set IF_OUTPUT to True in weaver_isb_am1_usrp4.py. diff --git a/gr-uhd/apps/hf_radio/hfir.sci b/gr-uhd/apps/hf_radio/hfir.sci index 64f5385d73..291bdbc3f4 100644 --- a/gr-uhd/apps/hf_radio/hfir.sci +++ b/gr-uhd/apps/hf_radio/hfir.sci @@ -15,7 +15,7 @@ // The filter is a lowpass kaiser windowed filter with parameter 3 // The phase response is 45 degrees for positive frequencies and -45 // for negative frequencies. -// The coefficent set is used in one path and the same coefficients +// The coefficient set is used in one path and the same coefficients // are used time reversed in the other. This results in the net effect // of +/- 90 degrees as in the usual hilbert application. // @@ -26,7 +26,7 @@ // and compensating delay but fascinating none the less. // // This program is for the scilab language a very powerful free math -// package similar to Matlab with infinitely better price/performace. +// package similar to Matlab with infinitely better price/performance. // // compute the prototype lowpass fir // length is 255 (odd) for the same symmetry reasons as the hilbert transformer diff --git a/gr-uhd/examples/python/fm_tx4.py b/gr-uhd/examples/python/fm_tx4.py index 516033dae1..b46311b524 100755 --- a/gr-uhd/examples/python/fm_tx4.py +++ b/gr-uhd/examples/python/fm_tx4.py @@ -189,7 +189,7 @@ class fm_tx_block(stdgui2.std_top_block): tune as close to the desired frequency as it can. Then we use the result of that operation and our target_frequency to determine the value for the digital up converter. Finally, we feed - any residual_freq to the s/w freq translater. + any residual_freq to the s/w freq translator. """ r = self.u.set_center_freq(target_freq, 0) diff --git a/gr-uhd/examples/python/usrp_tv_rcv.py b/gr-uhd/examples/python/usrp_tv_rcv.py index 301840f41d..7149fd0636 100755 --- a/gr-uhd/examples/python/usrp_tv_rcv.py +++ b/gr-uhd/examples/python/usrp_tv_rcv.py @@ -62,7 +62,7 @@ class tv_rx_block (stdgui2.std_top_block): stdgui2.std_top_block.__init__ (self,frame,panel,vbox,argv) usage="%prog: [options] [input_filename]. \n If you don't specify an input filename the usrp will be used as source\n " \ - "Make sure your input capture file containes interleaved shorts not complex floats" + "Make sure your input capture file contains interleaved shorts not complex floats" parser=OptionParser(option_class=eng_option, usage=usage) parser.add_option("-a", "--args", type="string", default="", help="UHD device address args [default=%default]") diff --git a/gr-uhd/examples/python/usrp_tv_rcv_nogui.py b/gr-uhd/examples/python/usrp_tv_rcv_nogui.py index 80e2e1c17a..9c6f0e2a89 100755 --- a/gr-uhd/examples/python/usrp_tv_rcv_nogui.py +++ b/gr-uhd/examples/python/usrp_tv_rcv_nogui.py @@ -29,7 +29,7 @@ usrp_rx_cfile.py) Can also use usrp directly as capture source, but then you need a higher decimation factor (64) and thus get a lower horizontal -resulution. There is no synchronisation yet. The sync blocks are in +resolution. There is no synchronisation yet. The sync blocks are in development but not yet in cvs. """ @@ -58,7 +58,7 @@ class my_top_block(gr.top_block): usage=("%prog: [options] output_filename.\nSpecial output_filename" + \ "\"sdl\" will use video_sink_sdl as realtime output window. " + \ "You then need to have gr-video-sdl installed.\n" +\ - "Make sure your input capture file containes interleaved " + \ + "Make sure your input capture file contains interleaved " + \ "shorts not complex floats") parser = OptionParser(option_class=eng_option, usage=usage) parser.add_option("-a", "--args", type="string", default="", diff --git a/gr-uhd/examples/python/usrp_wfm_rcv_sca.py b/gr-uhd/examples/python/usrp_wfm_rcv_sca.py index 9069a745f9..4ddb0ff3dd 100755 --- a/gr-uhd/examples/python/usrp_wfm_rcv_sca.py +++ b/gr-uhd/examples/python/usrp_wfm_rcv_sca.py @@ -37,7 +37,7 @@ displayed on the Post FM Demod FFT if present. The range below 67 kHz is used for SCA only when Stereo is not used. -The SCA recieve range is not as far as the main FM carrier receive range +The SCA receive range is not as far as the main FM carrier receive range so tune in strong local stations first. I tried to comment the code with the various parameters. There seems to diff --git a/gr-uhd/python/uhd/__init__.py b/gr-uhd/python/uhd/__init__.py index 6d7f232466..0e8176f97f 100644 --- a/gr-uhd/python/uhd/__init__.py +++ b/gr-uhd/python/uhd/__init__.py @@ -72,8 +72,8 @@ def _prepare_uhd_swig(): def __init__(self, *args, **kwargs): super(stream_args_t, self).__init__(*args) for key, val in kwargs.iteritems(): - #for some reason, i cant assign a list in the constructor - #but what i can do is append the elements individually + #for some reason, I can't assign a list in the constructor + #but what I can do is append the elements individually if key == 'channels': for v in val: self.channels.append(v) elif key == 'args': @@ -116,7 +116,7 @@ def _prepare_uhd_swig(): if len(args) > index: args[index] = cast(args[index]) if kwargs.has_key(key): kwargs[key] = cast(kwargs[key]) except: pass - #dont pass kwargs, it confuses swig, map into args list: + #don't pass kwargs, it confuses swig, map into args list: for key in ('device_addr', 'stream_args', 'io_type', 'num_channels', 'msgq'): if kwargs.has_key(key): args.append(kwargs[key]) return old_constructor(*args) diff --git a/gr-utils/python/modtool/cmakefile_editor.py b/gr-utils/python/modtool/cmakefile_editor.py index d57c650c5e..4148ad1960 100644 --- a/gr-utils/python/modtool/cmakefile_editor.py +++ b/gr-utils/python/modtool/cmakefile_editor.py @@ -50,7 +50,7 @@ class CMakeFileEditor(object): Then run: >>> C.remove_value('list', 'file.cc', 'SOURCES') - Returns the number of occurences of entry in the current file + Returns the number of occurrences of entry in the current file that were removed. """ # In the case of the example above, these are cases we need to catch: diff --git a/gr-utils/python/modtool/gr-newmod/cmake/Modules/CMakeParseArgumentsCopy.cmake b/gr-utils/python/modtool/gr-newmod/cmake/Modules/CMakeParseArgumentsCopy.cmake index 7ce4c49ae5..66016cb2ff 100644 --- a/gr-utils/python/modtool/gr-newmod/cmake/Modules/CMakeParseArgumentsCopy.cmake +++ b/gr-utils/python/modtool/gr-newmod/cmake/Modules/CMakeParseArgumentsCopy.cmake @@ -58,7 +58,7 @@ # the new option. # E.g. my_install(TARGETS foo DESTINATION OPTIONAL) would result in # MY_INSTALL_DESTINATION set to "OPTIONAL", but MY_INSTALL_DESTINATION would -# be empty and MY_INSTALL_OPTIONAL would be set to TRUE therefor. +# be empty and MY_INSTALL_OPTIONAL would be set to TRUE therefore. #============================================================================= # Copyright 2010 Alexander Neundorf <neundorf@kde.org> diff --git a/gr-utils/python/modtool/gr-newmod/cmake/Modules/GrMiscUtils.cmake b/gr-utils/python/modtool/gr-newmod/cmake/Modules/GrMiscUtils.cmake index 5bad57c51e..426fcfcf29 100644 --- a/gr-utils/python/modtool/gr-newmod/cmake/Modules/GrMiscUtils.cmake +++ b/gr-utils/python/modtool/gr-newmod/cmake/Modules/GrMiscUtils.cmake @@ -190,7 +190,7 @@ endfunction(GR_LIBRARY_FOO) # GR_GEN_TARGET_DEPS(unique_name target_deps <target1> <target2> ...) # ADD_CUSTOM_COMMAND(<the usual args> ${target_deps}) # -# Custom command cant depend on targets, but can depend on executables, +# Custom command can't depend on targets, but can depend on executables, # and executables can depend on targets. So this is the process: ######################################################################## function(GR_GEN_TARGET_DEPS name var) @@ -209,7 +209,7 @@ function(GR_GEN_TARGET_DEPS name var) endif(ARGN) if(CMAKE_CROSSCOMPILING) - set(${var} "DEPENDS;${name}" PARENT_SCOPE) #cant call command when cross + set(${var} "DEPENDS;${name}" PARENT_SCOPE) #can't call command when cross else() set(${var} "DEPENDS;${name};COMMAND;${name}" PARENT_SCOPE) endif() diff --git a/gr-utils/python/modtool/gr-newmod/cmake/Modules/GrSwig.cmake b/gr-utils/python/modtool/gr-newmod/cmake/Modules/GrSwig.cmake index 33f37d2731..04798b08e7 100644 --- a/gr-utils/python/modtool/gr-newmod/cmake/Modules/GrSwig.cmake +++ b/gr-utils/python/modtool/gr-newmod/cmake/Modules/GrSwig.cmake @@ -35,7 +35,7 @@ include(GrPython) function(GR_SWIG_MAKE_DOCS output_file) if(ENABLE_DOXYGEN) - #setup the input files variable list, quote formated + #setup the input files variable list, quote formatted set(input_files) unset(INPUT_PATHS) foreach(input_path ${ARGN}) @@ -245,7 +245,7 @@ def get_swig_deps(file_path, level): inc_path = os.path.join(inc_dir, inc_file) if not os.path.exists(inc_path): continue deps.extend(get_swig_deps(inc_path, level-1)) - break #found, we dont search in lower prio inc dirs + break #found, we don't search in lower prio inc dirs return deps if __name__ == '__main__': diff --git a/gr-utils/python/modtool/gr-newmod/docs/doxygen/Doxyfile.in b/gr-utils/python/modtool/gr-newmod/docs/doxygen/Doxyfile.in index ef07c13205..da8cb6ac38 100644 --- a/gr-utils/python/modtool/gr-newmod/docs/doxygen/Doxyfile.in +++ b/gr-utils/python/modtool/gr-newmod/docs/doxygen/Doxyfile.in @@ -945,7 +945,7 @@ HTML_STYLESHEET = # user-defined cascading style sheet that is included after the standard # style sheets created by doxygen. Using this option one can overrule # certain style aspects. This is preferred over using HTML_STYLESHEET -# since it does not replace the standard style sheet and is therefor more +# since it does not replace the standard style sheet and is therefore more # robust against future updates. Doxygen will copy the style sheet file to # the output directory. diff --git a/gr-utils/python/modtool/gr-newmod/docs/doxygen/Doxyfile.swig_doc.in b/gr-utils/python/modtool/gr-newmod/docs/doxygen/Doxyfile.swig_doc.in index 19e17dc925..7470475c2c 100644 --- a/gr-utils/python/modtool/gr-newmod/docs/doxygen/Doxyfile.swig_doc.in +++ b/gr-utils/python/modtool/gr-newmod/docs/doxygen/Doxyfile.swig_doc.in @@ -913,7 +913,7 @@ HTML_STYLESHEET = # user-defined cascading style sheet that is included after the standard # style sheets created by doxygen. Using this option one can overrule # certain style aspects. This is preferred over using HTML_STYLESHEET -# since it does not replace the standard style sheet and is therefor more +# since it does not replace the standard style sheet and is therefore more # robust against future updates. Doxygen will copy the style sheet file to # the output directory. diff --git a/gr-utils/python/modtool/modtool_rename.py b/gr-utils/python/modtool/modtool_rename.py index 4d3f5cb17e..cc6bd3bd02 100644 --- a/gr-utils/python/modtool/modtool_rename.py +++ b/gr-utils/python/modtool/modtool_rename.py @@ -190,7 +190,7 @@ class ModToolRename(ModTool): if not os.path.isfile(filename): return False else: - print "In '%s' renaming occurences of '%s' to '%s'" % (filename, old, new) + print "In '%s' renaming occurrences of '%s' to '%s'" % (filename, old, new) cfile = open(filename).read() (cfile, nsubs) = re.subn(old, new, cfile) diff --git a/gr-utils/python/modtool/scm.py b/gr-utils/python/modtool/scm.py index ec6023ab3b..9b0ef7db5e 100644 --- a/gr-utils/python/modtool/scm.py +++ b/gr-utils/python/modtool/scm.py @@ -205,7 +205,7 @@ class SCMRepoFactory(object): return SCMRepository(self.path_to_repo) def make_empty_scm_manager(self, scm_type='git'): - """ Returns a valid, usable object of type SCMRepository for an unitialized dir. """ + """ Returns a valid, usable object of type SCMRepository for an uninitialized dir. """ if self.options.scm_mode == 'no': return SCMRepository(self.path_to_repo) for glbl in globals().values(): diff --git a/gr-video-sdl/lib/sink_s_impl.cc b/gr-video-sdl/lib/sink_s_impl.cc index 3ca19840ba..0e54298caf 100644 --- a/gr-video-sdl/lib/sink_s_impl.cc +++ b/gr-video-sdl/lib/sink_s_impl.cc @@ -219,7 +219,7 @@ namespace gr { current_line++; if(current_line > max_height) { //Start new frame - //TODO, do this all in a seperate thread + //TODO, do this all in a separate thread current_line=0; dst_pixels=d_image->pixels[first_dst_plane]; dst_pixels_2=d_image->pixels[second_dst_plane]; diff --git a/gr-video-sdl/lib/sink_uc_impl.cc b/gr-video-sdl/lib/sink_uc_impl.cc index 85176704f9..31aa501a09 100644 --- a/gr-video-sdl/lib/sink_uc_impl.cc +++ b/gr-video-sdl/lib/sink_uc_impl.cc @@ -214,7 +214,7 @@ namespace gr { if(current_line > max_height) { //Start new frame - //TODO, do this all in a seperate thread + //TODO, do this all in a separate thread current_line = 0; dst_pixels = d_image->pixels[first_dst_plane]; dst_pixels_2 = d_image->pixels[second_dst_plane]; diff --git a/gr-vocoder/docs/vocoder.dox b/gr-vocoder/docs/vocoder.dox index 214d652a8b..2e2740f0d5 100644 --- a/gr-vocoder/docs/vocoder.dox +++ b/gr-vocoder/docs/vocoder.dox @@ -27,7 +27,7 @@ must convert audio signals from float to short by using a type conversion and a scaling factor. See the examples. The format of the encoded audio is different for every encoder. See the -individual block's documention for the data format. Encoded data is usually +individual block's documentation for the data format. Encoded data is usually a vector of fixed length, and can either be packed or unpacked. */ diff --git a/gr-vocoder/include/gnuradio/vocoder/cvsd_decode_bs.h b/gr-vocoder/include/gnuradio/vocoder/cvsd_decode_bs.h index bacc5ae595..53addc58bf 100644 --- a/gr-vocoder/include/gnuradio/vocoder/cvsd_decode_bs.h +++ b/gr-vocoder/include/gnuradio/vocoder/cvsd_decode_bs.h @@ -103,7 +103,7 @@ namespace gr { * Default: "1280" * \param step_decay Decay factor applied to step size when there is not a run of J output 1s or 0s. * Default: "0.9990234375" (i.e. 1-1/1024) - * \param accum_decay Decay factor applied to the internal reference during every interation of the codec. + * \param accum_decay Decay factor applied to the internal reference during every iteration of the codec. * Default: "0.96875" (i.e. 1-1/32) * \param K Size of shift register; the number of output bits remembered by codec (must be <= to 32). * Default: "32" diff --git a/gr-vocoder/include/gnuradio/vocoder/cvsd_encode_sb.h b/gr-vocoder/include/gnuradio/vocoder/cvsd_encode_sb.h index da1e92f6ad..71883625cb 100644 --- a/gr-vocoder/include/gnuradio/vocoder/cvsd_encode_sb.h +++ b/gr-vocoder/include/gnuradio/vocoder/cvsd_encode_sb.h @@ -99,7 +99,7 @@ namespace gr { * \param max_step Maximum step size used to update the internal reference. Default: "1280" * \param step_decay Decay factor applied to step size when there is not a run of J output 1s or 0s. * Default: "0.9990234375" (i.e. 1-1/1024) - * \param accum_decay Decay factor applied to the internal reference during every interation of the codec. + * \param accum_decay Decay factor applied to the internal reference during every iteration of the codec. * Default: "0.96875" (i.e. 1-1/32) * \param K Size of shift register; the number of output bits remembered by codec (must be <= to 32). * Default: "32" diff --git a/gr-vocoder/lib/codec2/c2sim.c b/gr-vocoder/lib/codec2/c2sim.c index e68f2aceeb..14d7ee8eed 100644 --- a/gr-vocoder/lib/codec2/c2sim.c +++ b/gr-vocoder/lib/codec2/c2sim.c @@ -558,7 +558,7 @@ int main(int argc, char *argv[]) #endif /* experimenting with non-linear LSP spacing to see if - it's just noticable */ + it's just noticeable */ if (lspjnd) { for(i=0; i<LPC_ORD; i++) diff --git a/gr-vocoder/lib/codec2/codec2.c b/gr-vocoder/lib/codec2/codec2.c index 5bf998064b..b7e963a98a 100644 --- a/gr-vocoder/lib/codec2/codec2.c +++ b/gr-vocoder/lib/codec2/codec2.c @@ -221,7 +221,7 @@ int CODEC2_WIN32SUPPORT codec2_samples_per_frame(struct CODEC2 *c2) { if (c2->mode == CODEC2_MODE_1200) return 320; - return 0; /* shouldnt get here */ + return 0; /* shouldn't get here */ } void CODEC2_WIN32SUPPORT codec2_encode(struct CODEC2 *c2, unsigned char *bits, short speech[]) diff --git a/gr-vocoder/lib/codec2/fdmdv.c b/gr-vocoder/lib/codec2/fdmdv.c index 51d6bef544..945b15778a 100644 --- a/gr-vocoder/lib/codec2/fdmdv.c +++ b/gr-vocoder/lib/codec2/fdmdv.c @@ -1493,8 +1493,8 @@ void CODEC2_WIN32SUPPORT fdmdv_48_to_8(float out8k[], float in48k[], int n) range for plotting is 0 to -40dB. Note only the real part of the complex input signal is used at - present. A complex variable is used for input for compatability - with the other rx signal procesing. + present. A complex variable is used for input for compatibility + with the other rx signal processing. Successive calls can be used to build up a waterfall or spectrogram plot, by mapping the received levels to colours. diff --git a/gr-vocoder/lib/codec2/interp.c b/gr-vocoder/lib/codec2/interp.c index be89fc3154..8f60eaf819 100644 --- a/gr-vocoder/lib/codec2/interp.c +++ b/gr-vocoder/lib/codec2/interp.c @@ -43,7 +43,7 @@ float sample_log_amp(MODEL *model, float w); AUTHOR......: David Rowe DATE CREATED: 22/8/10 - Given two frames decribed by model parameters 20ms apart, determines + Given two frames described by model parameters 20ms apart, determines the model parameters of the 10ms frame between them. Assumes voicing is available for middle (interpolated) frame. Outputs are amplitudes and Wo for the interpolated frame. @@ -135,7 +135,7 @@ float sample_log_amp(MODEL *model, float w) AUTHOR......: David Rowe DATE CREATED: 10 Nov 2010 - Given two frames decribed by model parameters 20ms apart, determines + Given two frames described by model parameters 20ms apart, determines the model parameters of the 10ms frame between them. Assumes voicing is available for middle (interpolated) frame. Outputs are amplitudes and Wo for the interpolated frame. diff --git a/gr-vocoder/lib/codec2/kiss_fft.c b/gr-vocoder/lib/codec2/kiss_fft.c index 17b4e72112..d3b50f8702 100644 --- a/gr-vocoder/lib/codec2/kiss_fft.c +++ b/gr-vocoder/lib/codec2/kiss_fft.c @@ -15,7 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND #include "_kiss_fft_guts.h" /* The guts header contains all the multiplication and addition macros that are defined for - fixed or floating point complex numbers. It also delares the kf_ internal functions. + fixed or floating point complex numbers. It also declares the kf_ internal functions. */ static void kf_bfly2( diff --git a/gr-vocoder/lib/codec2/lpc.c b/gr-vocoder/lib/codec2/lpc.c index 9a730eb4ad..c24da79595 100644 --- a/gr-vocoder/lib/codec2/lpc.c +++ b/gr-vocoder/lib/codec2/lpc.c @@ -225,7 +225,7 @@ void inverse_filter( The synthesis filter has memory as well, this is treated in the same way as the memory for the inverse filter (see inverse_filter() notes above). The difference is that the memory for the synthesis filter is stored in - the output array, wheras the memory of the inverse filter is stored in the + the output array, whereas the memory of the inverse filter is stored in the input array. Note: the calling function must update the filter memory. diff --git a/gr-vocoder/lib/codec2/lsp.c b/gr-vocoder/lib/codec2/lsp.c index 3f34444e33..c69eb4ccfa 100644 --- a/gr-vocoder/lib/codec2/lsp.c +++ b/gr-vocoder/lib/codec2/lsp.c @@ -80,7 +80,7 @@ AUTHOR......: David Rowe DATE CREATED: 24/2/93 - This function evalutes a series of chebyshev polynomials + This function evaluates a series of chebyshev polynomials FIXME: performing memory allocation at run time is very inefficient, replace with stack variables of MAX_P size. diff --git a/gr-vocoder/lib/codec2/machdep.h b/gr-vocoder/lib/codec2/machdep.h index ef2e64943e..77a18e575b 100644 --- a/gr-vocoder/lib/codec2/machdep.h +++ b/gr-vocoder/lib/codec2/machdep.h @@ -4,7 +4,7 @@ AUTHOR......: David Rowe DATE CREATED: May 2 2013 - Machine dependant functions. + Machine dependent functions. \*---------------------------------------------------------------------------*/ diff --git a/gr-vocoder/lib/codec2/phaseexp.c b/gr-vocoder/lib/codec2/phaseexp.c index 61b240df49..128f9092d6 100644 --- a/gr-vocoder/lib/codec2/phaseexp.c +++ b/gr-vocoder/lib/codec2/phaseexp.c @@ -541,7 +541,7 @@ static void top_amp(struct PEXP *pexp, MODEL *model, int start, int end, int n_h removed++; } else { - /* need to make this work thru budget of bits */ + /* need to make this work through budget of bits */ quant_phase(&model->phi[i], -PI, PI, 3); not_removed++; } diff --git a/gr-vocoder/lib/codec2/postfilter.c b/gr-vocoder/lib/codec2/postfilter.c index 7c1a6061a0..7439522408 100644 --- a/gr-vocoder/lib/codec2/postfilter.c +++ b/gr-vocoder/lib/codec2/postfilter.c @@ -82,8 +82,8 @@ 1/ If someone says "aaaaaaaahhhhhhhhh" will background estimator track up to speech level? This would be a bad thing. - 2/ If background noise suddenly dissapears from the source speech does - estimate drop quickly? What is noise suddenly re-appears? + 2/ If background noise suddenly disappears from the source speech does + estimate drop quickly? What if noise suddenly re-appears? 3/ Background noise with a non-flat sepctrum. Current algorithm just comsiders scpetrum as a whole, but this could be broken up into @@ -115,7 +115,7 @@ void postfilter( assert(e > 0.0); e = 10.0*log10f(e/model->L); - /* If beneath threhold, update bg estimate. The idea + /* If beneath threshold, update bg estimate. The idea of the threshold is to prevent updating during high level speech. */ diff --git a/gr-vocoder/lib/codec2/quantise.c b/gr-vocoder/lib/codec2/quantise.c index f7326c4fcd..919d0c0bbc 100644 --- a/gr-vocoder/lib/codec2/quantise.c +++ b/gr-vocoder/lib/codec2/quantise.c @@ -762,7 +762,7 @@ void force_min_lsp_dist(float lsp[], int lpc_order) lpc_post_filter() Applies a post filter to the LPC synthesis filter power spectrum - Pw, which supresses the inter-formant energy. + Pw, which suppresses the inter-formant energy. The algorithm is from p267 (Section 8.6) of "Digital Speech", edited by A.M. Kondoz, 1994 published by Wiley and Sons. Chapter 8 @@ -1003,7 +1003,7 @@ void aks_to_M2( just above nulls. This algorithm does the reverse to compensate - raising the amplitudes of spectral peaks, while attenuating the null. This enhances the formants, and - supresses the energy between formants. */ + suppresses the energy between formants. */ if (sim_pf) { if (Am > model->A[m]) @@ -1607,7 +1607,7 @@ void bw_expand_lsps2(float lsp[], Applies a form of Bandwidth Expansion (BW) to a vector of LSPs. Listening tests have determined that "quantising" the position of - each LSP to the non-linear steps below introduces a "just noticable + each LSP to the non-linear steps below introduces a "just noticeable difference" in the synthesised speech. This operation can be used before quantisation to limit the input @@ -1830,7 +1830,7 @@ void compute_weights2(const float *x, const float *xp, float *w, int ndim) both the pitch and energy tend to only change by small amounts during voiced speech, however it is important that these changes be coded carefully. During unvoiced speech they both change a lot but - the ear is less sensitve to errors so coarser quantisation is OK. + the ear is less sensitive to errors so coarser quantisation is OK. The ear is sensitive to log energy and loq pitch so we quantise in these domains. That way the error measure used to quantise the diff --git a/gr-vocoder/lib/codec2/sine.c b/gr-vocoder/lib/codec2/sine.c index be4df00a6d..ee77a6e0de 100644 --- a/gr-vocoder/lib/codec2/sine.c +++ b/gr-vocoder/lib/codec2/sine.c @@ -238,7 +238,7 @@ void dft_speech(kiss_fft_cfg fft_fwd_cfg, COMP Sw[], float Sn[], float w[]) void two_stage_pitch_refinement(MODEL *model, COMP Sw[]) { - float pmin,pmax,pstep; /* pitch refinment minimum, maximum and step */ + float pmin,pmax,pstep; /* pitch refinement minimum, maximum and step */ /* Coarse refinement */ @@ -461,7 +461,7 @@ float est_voicing_mbe( /* post processing, helps clean up some voicing errors ------------------*/ /* - Determine the ratio of low freqency to high frequency energy, + Determine the ratio of low frequency to high frequency energy, voiced speech tends to be dominated by low frequency energy, unvoiced by high frequency. This measure can be used to determine if we have made any gross errors. @@ -511,7 +511,7 @@ float est_voicing_mbe( AUTHOR......: David Rowe DATE CREATED: 11/5/94 - Init function that generates the trapezoidal (Parzen) sythesis window. + Init function that generates the trapezoidal (Parzen) synthesis window. \*---------------------------------------------------------------------------*/ @@ -545,7 +545,7 @@ void make_synthesis_window(float Pn[]) Synthesise a speech signal in the frequency domain from the sinusodal model parameters. Uses overlap-add with a trapezoidal - window to smoothly interpolate betwen frames. + window to smoothly interpolate between frames. \*---------------------------------------------------------------------------*/ diff --git a/gr-vocoder/lib/cvsd_decode_bs_impl.cc b/gr-vocoder/lib/cvsd_decode_bs_impl.cc index b6b42cef60..f0603b78d9 100644 --- a/gr-vocoder/lib/cvsd_decode_bs_impl.cc +++ b/gr-vocoder/lib/cvsd_decode_bs_impl.cc @@ -122,7 +122,7 @@ namespace gr { // Loop through each input data point for(i = 0; i < noutput_items/8.0; i++) { input_byte = in[i]; - // Initiliaze bit counter + // Initialize bit counter bit_count=0; while(bit_count<8) { diff --git a/gr-vocoder/lib/cvsd_encode_sb_impl.cc b/gr-vocoder/lib/cvsd_encode_sb_impl.cc index 3c8d69c1d2..3c4656cf34 100644 --- a/gr-vocoder/lib/cvsd_encode_sb_impl.cc +++ b/gr-vocoder/lib/cvsd_encode_sb_impl.cc @@ -129,7 +129,7 @@ namespace gr { // Update Accum (i.e. the reference value) if(output_bit) { d_accum=d_accum+d_stepsize; - //printf("Addding %d to the accum; the result is: %d.\n", d_stepsize, d_accum); + //printf("Adding %d to the accum; the result is: %d.\n", d_stepsize, d_accum); } else { d_accum=d_accum-d_stepsize; @@ -165,7 +165,7 @@ namespace gr { // Runner is a shift-register; shift left, add on newest output bit d_runner = (d_runner<<1) | ((unsigned int) output_bit); - // Update the ouput type; shift left, add on newest output bit + // Update the output type; shift left, add on newest output bit // If you have put in 8 bits, output it as a byte output_byte = (output_byte<<1) | output_bit; bit_count++; diff --git a/gr-vocoder/lib/cvsd_encode_sb_impl.h b/gr-vocoder/lib/cvsd_encode_sb_impl.h index 546b029d19..8b9282b865 100644 --- a/gr-vocoder/lib/cvsd_encode_sb_impl.h +++ b/gr-vocoder/lib/cvsd_encode_sb_impl.h @@ -44,7 +44,7 @@ namespace gr { //! \return the number of 1s in the four bytes of an input unsigned integer unsigned char cvsd_bitwise_sum(unsigned int input); - // Members variables related to the CVSD encoder use to update interal reference value + // Members variables related to the CVSD encoder use to update internal reference value short d_min_step; short d_max_step; double d_step_decay; diff --git a/gr-vocoder/lib/g7xx/g72x.h b/gr-vocoder/lib/g7xx/g72x.h index 9d906cae75..6186788660 100644 --- a/gr-vocoder/lib/g7xx/g72x.h +++ b/gr-vocoder/lib/g7xx/g72x.h @@ -42,7 +42,7 @@ * used by the G.721/G.723 encoder and decoder to preserve their internal * state between successive calls. The meanings of the majority * of the state structure fields are explained in detail in the - * CCITT Recommendation G.721. The field names are essentially indentical + * CCITT Recommendation G.721. The field names are essentially identical * to variable names in the bit level description of the coding algorithm * included in this Recommendation. */ diff --git a/gr-wxgui/python/wxgui/fft_window.py b/gr-wxgui/python/wxgui/fft_window.py index 024200556e..b0f65cc5c9 100644 --- a/gr-wxgui/python/wxgui/fft_window.py +++ b/gr-wxgui/python/wxgui/fft_window.py @@ -101,7 +101,7 @@ class control_panel(wx.Panel): parent.subscribe(AVERAGE_KEY, widget.Enable) widget.Enable(parent[AVERAGE_KEY]) parent.subscribe(AVERAGE_KEY, widget.ShowItems) - #allways show initially, so room is reserved for them + #always show initially, so room is reserved for them widget.ShowItems(True) # (parent[AVERAGE_KEY]) parent.subscribe(AVERAGE_KEY, self._update_layout) @@ -127,7 +127,7 @@ class control_panel(wx.Panel): parent.subscribe(USE_PERSISTENCE_KEY, widget.Enable) widget.Enable(parent[USE_PERSISTENCE_KEY]) parent.subscribe(USE_PERSISTENCE_KEY, widget.ShowItems) - #allways show initially, so room is reserved for them + #always show initially, so room is reserved for them widget.ShowItems(True) # (parent[USE_PERSISTENCE_KEY]) parent.subscribe(USE_PERSISTENCE_KEY, self._update_layout) @@ -201,7 +201,7 @@ class control_panel(wx.Panel): ################################################## def _update_layout(self,key): # Just ignore the key value we get - # we only need to now that the visability or size of something has changed + # we only need to now that the visibility or size of something has changed self.parent.Layout() #self.parent.Fit() @@ -254,7 +254,7 @@ class fft_window(wx.Panel, pubsub.pubsub): self[PERSIST_ALPHA_KEY] = persist_alpha for trace in TRACES: #a function that returns a function - #so the function wont use local trace + #so the function won't use local trace def new_store_trace(my_trace): def store_trace(*args): self._traces[my_trace] = self.samples diff --git a/gr-wxgui/python/wxgui/plot.py b/gr-wxgui/python/wxgui/plot.py index 041a2a7a50..5875f818c2 100644 --- a/gr-wxgui/python/wxgui/plot.py +++ b/gr-wxgui/python/wxgui/plot.py @@ -11,7 +11,7 @@ #----------------------------------------------------------------------------- # 12/15/2003 - Jeff Grimmett (grimmtooth@softhome.net) # -# o 2.5 compatability update. +# o 2.5 compatibility update. # o Renamed to plot.py in the wx.lib directory. # o Reworked test frame to work with wx demo framework. This saves a bit # of tedious cut and paste, and the test app is excellent. @@ -508,7 +508,7 @@ class PlotCanvas(wx.Window): # SaveFile def SaveFile(self, fileName= ''): """Saves the file to the type specified in the extension. If no file - name is specified a dialog box is provided. Returns True if sucessful, + name is specified a dialog box is provided. Returns True if successful, otherwise False. .bmp Save a Windows bitmap file. @@ -528,7 +528,7 @@ class PlotCanvas(wx.Window): while 1: if dlg1.ShowModal() == wx.ID_OK: fileName = dlg1.GetPath() - # Check for proper exension + # Check for proper extension if _string.lower(fileName[-3:]) not in ['bmp','xbm','xpm','png','jpg']: dlg2 = wx.MessageDialog(self, 'File name extension\n' 'must be one of\n' @@ -1435,7 +1435,7 @@ class PlotPrintout(wx.Printout): ## print "DC GetSize", dc.GetSize() ## print "GetPageSizePixels", self.GetPageSizePixels() # Note PPIScreen does not give the correct number - # Calulate everything for printer and then scale for preview + # Calculate everything for printer and then scale for preview PPIPrinter= self.GetPPIPrinter() # printer dots/inch (w,h) #PPIScreen= self.GetPPIScreen() # screen dots/inch (w,h) dcSize= dc.GetSize() # DC size @@ -1667,7 +1667,7 @@ class TestFrame(wx.Frame): self.Show(True) def DrawPointLabel(self, dc, mDataDict): - """This is the fuction that defines how the pointLabels are plotted + """This is the function that defines how the pointLabels are plotted dc - DC that will be passed mDataDict - Dictionary of data that you want to use for the pointLabel diff --git a/gr-wxgui/python/wxgui/plotter/gltext.py b/gr-wxgui/python/wxgui/plotter/gltext.py index 55627bceb1..81c9a77141 100644 --- a/gr-wxgui/python/wxgui/plotter/gltext.py +++ b/gr-wxgui/python/wxgui/plotter/gltext.py @@ -24,7 +24,7 @@ from OpenGL.GL import * """ Optimize with psyco if possible, this gains us about 50% speed when creating our textures in trade for about 4MBytes of additional memory usage for -psyco. If you don't like loosing the memory you have to turn the lines following +psyco. If you don't like losing the memory you have to turn the lines following "enable psyco" into a comment while uncommenting the line after "Disable psyco". """ #Try to enable psyco diff --git a/gr-wxgui/python/wxgui/scope_window.py b/gr-wxgui/python/wxgui/scope_window.py index 71e2b8e285..ebca318c55 100644 --- a/gr-wxgui/python/wxgui/scope_window.py +++ b/gr-wxgui/python/wxgui/scope_window.py @@ -121,7 +121,7 @@ class control_panel(wx.Panel): parent.subscribe(USE_PERSISTENCE_KEY, widget.Enable) widget.Enable(parent[USE_PERSISTENCE_KEY]) parent.subscribe(USE_PERSISTENCE_KEY, widget.ShowItems) - #allways show initially, so room is reserved for them + #always show initially, so room is reserved for them widget.ShowItems(True) # (parent[USE_PERSISTENCE_KEY]) parent.subscribe(USE_PERSISTENCE_KEY, self._update_layout) @@ -407,7 +407,7 @@ class control_panel(wx.Panel): ################################################## def _update_layout(self,key): # Just ignore the key value we get - # we only need to now that the visability or size of something has changed + # we only need to now that the visibility or size of something has changed self.parent.Layout() #self.parent.Fit() diff --git a/gr-zeromq/lib/base_impl.cc b/gr-zeromq/lib/base_impl.cc index 76baeafff2..20c5d3845d 100644 --- a/gr-zeromq/lib/base_impl.cc +++ b/gr-zeromq/lib/base_impl.cc @@ -193,7 +193,7 @@ namespace gr { } } - /* Each message must contain an integer mutliple of data vectors */ + /* Each message must contain an integer multiple of data vectors */ if ((d_msg.size() - d_consumed_bytes) % d_vsize != 0) { throw std::runtime_error( diff --git a/gr-zeromq/lib/rep_sink_impl.cc b/gr-zeromq/lib/rep_sink_impl.cc index 0303f65db4..d502ea4780 100644 --- a/gr-zeromq/lib/rep_sink_impl.cc +++ b/gr-zeromq/lib/rep_sink_impl.cc @@ -65,7 +65,7 @@ namespace gr { zmq::pollitem_t items[] = { { static_cast<void *>(*d_socket), 0, ZMQ_POLLIN, 0 } }; zmq::poll(&items[0], 1, first ? d_timeout : 0); - /* If we dont have anything, we're done */ + /* If we don't have anything, we're done */ if (!(items[0].revents & ZMQ_POLLIN)) break; diff --git a/grc/blocks/parameter.xml b/grc/blocks/parameter.xml index 95d03e1412..dcbf9b5bc5 100644 --- a/grc/blocks/parameter.xml +++ b/grc/blocks/parameter.xml @@ -101,7 +101,7 @@ This block represents a parameter to the flow graph. \ A parameter can be used to pass command line arguments into a top block. \ Or, parameters can pass arguments into an instantiated hierarchical block. -The paramater value cannot depend on any variables. +The parameter value cannot depend on any variables. Leave the label blank to use the parameter id as the label. diff --git a/grc/core/Block.py b/grc/core/Block.py index f8179b113f..4be83b1304 100644 --- a/grc/core/Block.py +++ b/grc/core/Block.py @@ -686,7 +686,7 @@ class Block(Element): def resolve_dependencies(self, tmpl): """ - Resolve a paramater dependency with cheetah templates. + Resolve a parameter dependency with cheetah templates. Args: tmpl: the string with dependencies diff --git a/grc/core/Constants.py b/grc/core/Constants.py index 61a44d0c78..9e0a3f04b1 100644 --- a/grc/core/Constants.py +++ b/grc/core/Constants.py @@ -72,7 +72,7 @@ COMPLEX_TYPES = tuple(COMPLEX_TYPES + REAL_TYPES + INT_TYPES) REAL_TYPES = tuple(REAL_TYPES + INT_TYPES) INT_TYPES = tuple(INT_TYPES) -# Updating colors. Using the standard color pallette from: +# Updating colors. Using the standard color palette from: # http://www.google.com/design/spec/style/color.html#color-color-palette # Most are based on the main, primary color standard. Some are within # that color's spectrum when it was deemed necessary. diff --git a/grc/core/Platform.py b/grc/core/Platform.py index 258f38cc62..c977a04275 100644 --- a/grc/core/Platform.py +++ b/grc/core/Platform.py @@ -229,7 +229,7 @@ class Platform(Element): key = n.find('key') if not key: - print >> sys.stderr, 'Warning: Domain with emtpy key.\n\tIgnoring: {0}'.format(xml_file) + print >> sys.stderr, 'Warning: Domain with empty key.\n\tIgnoring: {0}'.format(xml_file) return if key in self.domains: # test against repeated keys print >> sys.stderr, 'Warning: Domain with key "{0}" already exists.\n\tIgnoring: {1}'.format(key, xml_file) diff --git a/grc/core/utils/odict.py b/grc/core/utils/odict.py index 9d69082600..e0ea0cc94f 100644 --- a/grc/core/utils/odict.py +++ b/grc/core/utils/odict.py @@ -66,7 +66,7 @@ class odict(DictMixin): def insert_before(self, pos_key, key, val): """ Insert the new key, value entry before the entry given by the position key. - If the positional key is None, insert at the begining. + If the positional key is None, insert at the beginning. Args: pos_key: the positional key diff --git a/grc/gui/Actions.py b/grc/gui/Actions.py index 6eccab75fb..5e728a350f 100644 --- a/grc/gui/Actions.py +++ b/grc/gui/Actions.py @@ -87,7 +87,7 @@ class _ActionBase(object): # set the accelerator group, and accelerator path # register the key name and mod mask with the accelerator path if label is None: - continue # dont register accel + continue # don't register accel accel_path = '<main>/' + self.get_name() self.set_accel_group(get_accel_group()) self.set_accel_path(accel_path) diff --git a/grc/gui/Block.py b/grc/gui/Block.py index 39c6993a37..e3de04961d 100644 --- a/grc/gui/Block.py +++ b/grc/gui/Block.py @@ -54,7 +54,7 @@ class Block(Element, _Block): def __init__(self, flow_graph, n): """ - Block contructor. + Block constructor. Add graphics related params to the block. """ _Block.__init__(self, flow_graph, n) diff --git a/grc/gui/Dialogs.py b/grc/gui/Dialogs.py index 83ad9651b2..4c89810bb6 100644 --- a/grc/gui/Dialogs.py +++ b/grc/gui/Dialogs.py @@ -251,7 +251,7 @@ def ChooseEditorDialog(config): 'Would you like to choose the editor to use?', gtk.RESPONSE_YES, buttons ) - # Handle the inital default/choose/cancel response + # Handle the initial default/choose/cancel response # User wants to choose the editor to use if response == gtk.RESPONSE_YES: file_dialog = gtk.FileChooserDialog( diff --git a/grc/gui/DrawingArea.py b/grc/gui/DrawingArea.py index 6a1df27a8c..64862ce6d8 100644 --- a/grc/gui/DrawingArea.py +++ b/grc/gui/DrawingArea.py @@ -33,7 +33,7 @@ class DrawingArea(gtk.DrawingArea): def __init__(self, flow_graph): """ - DrawingArea contructor. + DrawingArea constructor. Connect event handlers. Args: diff --git a/grc/gui/Executor.py b/grc/gui/Executor.py index f91a341541..bab23dfdb8 100644 --- a/grc/gui/Executor.py +++ b/grc/gui/Executor.py @@ -39,7 +39,7 @@ class ExecFlowGraphThread(threading.Thread): """ threading.Thread.__init__(self) - self.page = flow_graph_page # store page and dont use main window calls in run + self.page = flow_graph_page # store page and don't use main window calls in run self.xterm_executable = xterm_executable self.update_callback = callback diff --git a/grc/gui/FileDialogs.py b/grc/gui/FileDialogs.py index 9d047b1ffd..30978bbf9d 100644 --- a/grc/gui/FileDialogs.py +++ b/grc/gui/FileDialogs.py @@ -90,7 +90,7 @@ class FileDialogHelper(gtk.FileChooserDialog): def __init__(self, action, title): """ - FileDialogHelper contructor. + FileDialogHelper constructor. Create a save or open dialog with cancel and ok buttons. Use standard settings: no multiple selection, local files only, and the * filter. diff --git a/grc/gui/Port.py b/grc/gui/Port.py index 6314b7ede8..690b1087e3 100644 --- a/grc/gui/Port.py +++ b/grc/gui/Port.py @@ -40,7 +40,7 @@ class Port(_Port, Element): def __init__(self, block, n, dir): """ - Port contructor. + Port constructor. Create list of connector coordinates. """ _Port.__init__(self, block, n, dir) diff --git a/grc/gui/StateCache.py b/grc/gui/StateCache.py index 3cdb5f30ce..12ec9305b0 100644 --- a/grc/gui/StateCache.py +++ b/grc/gui/StateCache.py @@ -32,7 +32,7 @@ class StateCache(object): StateCache constructor. Args: - initial_state: the intial state (nested data) + initial_state: the initial state (nested data) """ self.states = [None] * STATE_CACHE_SIZE #fill states self.current_state_index = 0 diff --git a/grc/scripts/freedesktop/README b/grc/scripts/freedesktop/README index 0857ecc224..a467d72568 100644 --- a/grc/scripts/freedesktop/README +++ b/grc/scripts/freedesktop/README @@ -6,8 +6,8 @@ This directory contains icons, a mime type, and menu files for grc. Installation of these files requires a set of tools called xdg-utils. xdg-utils will install files in a standard way according to the freedesktop.org standards. -Desktop enviroments that implement these standards are gnome, kde, xfce, and others. -If you have one of these desktop enviroments, xdg-utils should come installed. +Desktop environments that implement these standards are gnome, kde, xfce, and others. +If you have one of these desktop environments, xdg-utils should come installed. If xdg-utils is not installed, then this directory will be ignored by the build. The gtk IconTheme module locates the installed icons for use inside the grc app. |