diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2017-03-20 21:27:30 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2017-03-20 21:27:30 -0700 |
| commit | 6c75cec94a78472b77c0bc3fdd2f1af6b6ab4acb (patch) | |
| tree | c18f17e8eaf9f30333484cb14618ee0ec9e156ed /gr-digital/include | |
| parent | fab36b019183844d539e387554fad70058d70caa (diff) | |
| parent | 5b400f1a6634dc4a2e220fc6a3944214d737bc4c (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'gr-digital/include')
| -rw-r--r-- | gr-digital/include/gnuradio/digital/header_format_counter.h | 1 | ||||
| -rw-r--r-- | gr-digital/include/gnuradio/digital/header_format_default.h | 10 |
2 files changed, 8 insertions, 3 deletions
diff --git a/gr-digital/include/gnuradio/digital/header_format_counter.h b/gr-digital/include/gnuradio/digital/header_format_counter.h index 5eb075afb9..752a9ec775 100644 --- a/gr-digital/include/gnuradio/digital/header_format_counter.h +++ b/gr-digital/include/gnuradio/digital/header_format_counter.h @@ -112,7 +112,6 @@ namespace gr { protected: uint16_t d_counter; //!< keeps track of the number of packets transmitted - uint16_t d_bps; //!< bits/sec of payload modulation //! Verify that the header is valid bool header_ok(); diff --git a/gr-digital/include/gnuradio/digital/header_format_default.h b/gr-digital/include/gnuradio/digital/header_format_default.h index 4abd7bb2db..bfea3567f8 100644 --- a/gr-digital/include/gnuradio/digital/header_format_default.h +++ b/gr-digital/include/gnuradio/digital/header_format_default.h @@ -82,7 +82,8 @@ namespace gr { : public header_format_base { public: - header_format_default(const std::string &access_code, int threshold); + header_format_default(const std::string &access_code, int threshold, + int bps); virtual ~header_format_default(); /*! @@ -179,13 +180,18 @@ namespace gr { * receiver. Can be up to 64-bits long. * \param threshold How many bits can be wrong in the access * code and still count as correct. + * \param bps The number of bits/second used in the payload's + * modulator. */ - static sptr make(const std::string &access_code, int threshold); + static sptr make(const std::string &access_code, int threshold, + int bps = 1); protected: uint64_t d_access_code; //!< register to hold the access code size_t d_access_code_len; //!< length in bits of the access code + uint16_t d_bps; //!< bits/sec of payload modulation + unsigned long long d_data_reg; //!< used to look for access_code unsigned long long d_mask; /*!< masks access_code bits (top N bits are set where N is the number of bits in the access code) */ |