- renamed preamble_sync to pocsag_decoder
git-svn-id: http://moon:8086/svn/software/trunk/projects/GnuRadio@415 b431acfa-c32f-4a4a-93f1-934dc6c82436
This commit is contained in:
@@ -30,7 +30,7 @@ list(APPEND jay_sources
|
||||
square2_ff_impl.cc
|
||||
garage_impl.cc
|
||||
PocsagDecoder.cpp
|
||||
preamble_sync_impl.cc )
|
||||
pocsag_decoder_impl.cc )
|
||||
|
||||
set(jay_sources "${jay_sources}" PARENT_SCOPE)
|
||||
if(NOT jay_sources)
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
#endif
|
||||
|
||||
#include <gnuradio/io_signature.h>
|
||||
#include "preamble_sync_impl.h"
|
||||
#include "pocsag_decoder_impl.h"
|
||||
|
||||
#define WITH_DEBUG_MESSAGES 0
|
||||
|
||||
@@ -32,18 +32,18 @@ namespace gr
|
||||
namespace jay
|
||||
{
|
||||
|
||||
preamble_sync::sptr preamble_sync::make()
|
||||
pocsag_decoder::sptr pocsag_decoder::make()
|
||||
{
|
||||
return gnuradio::get_initial_sptr (new preamble_sync_impl());
|
||||
return gnuradio::get_initial_sptr (new pocsag_decoder_impl());
|
||||
}
|
||||
|
||||
const char* preamble_sync_impl::stateNames[NUM_STATES] = {"PreambleSlow", "SyncSlow", "DataSlow", "PreambleFast", "SyncFast", "DataFast"};
|
||||
const char* pocsag_decoder_impl::stateNames[NUM_STATES] = {"PreambleSlow", "SyncSlow", "DataSlow", "PreambleFast", "SyncFast", "DataFast"};
|
||||
|
||||
/*
|
||||
* The private constructor
|
||||
*/
|
||||
preamble_sync_impl::preamble_sync_impl()
|
||||
: gr::block("preamble_sync", gr::io_signature::make(1, 1, sizeof(uint8_t)), gr::io_signature::make(1, 1, sizeof(uint8_t)))
|
||||
pocsag_decoder_impl::pocsag_decoder_impl()
|
||||
: gr::block("pocsag_decoder", gr::io_signature::make(1, 1, sizeof(uint8_t)), gr::io_signature::make(1, 1, sizeof(uint8_t)))
|
||||
, m_state(PreambleSlow)
|
||||
, m_stateNext(PreambleSlow)
|
||||
, m_word(0)
|
||||
@@ -57,16 +57,16 @@ preamble_sync_impl::preamble_sync_impl()
|
||||
/*
|
||||
* Our virtual destructor.
|
||||
*/
|
||||
preamble_sync_impl::~preamble_sync_impl()
|
||||
pocsag_decoder_impl::~pocsag_decoder_impl()
|
||||
{
|
||||
}
|
||||
|
||||
void preamble_sync_impl::forecast (int noutput_items, gr_vector_int &ninput_items_required)
|
||||
void pocsag_decoder_impl::forecast (int noutput_items, gr_vector_int &ninput_items_required)
|
||||
{
|
||||
ninput_items_required[0] = 8*noutput_items;
|
||||
}
|
||||
|
||||
int preamble_sync_impl::general_work (int noutput_items, gr_vector_int &ninput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items)
|
||||
int pocsag_decoder_impl::general_work (int noutput_items, gr_vector_int &ninput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items)
|
||||
{
|
||||
uint8_t zero = 0x01;
|
||||
const uint8_t fastSyncWord[4] = {0x7C, 0xD2, 0x15, 0xD8};
|
||||
@@ -18,10 +18,10 @@
|
||||
* Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
|
||||
#ifndef INCLUDED_JAY_PREAMBLE_SYNC_IMPL_H
|
||||
#define INCLUDED_JAY_PREAMBLE_SYNC_IMPL_H
|
||||
#ifndef INCLUDED_JAY_POCSAG_DECODER_IMPL_H
|
||||
#define INCLUDED_JAY_POCSAG_DECODER_IMPL_H
|
||||
|
||||
#include <jay/preamble_sync.h>
|
||||
#include <jay/pocsag_decoder.h>
|
||||
#include "PocsagDecoder.hpp"
|
||||
|
||||
namespace gr
|
||||
@@ -29,7 +29,7 @@ namespace gr
|
||||
namespace jay
|
||||
{
|
||||
|
||||
class preamble_sync_impl : public preamble_sync
|
||||
class pocsag_decoder_impl : public pocsag_decoder
|
||||
{
|
||||
private:
|
||||
enum State
|
||||
@@ -57,8 +57,8 @@ class preamble_sync_impl : public preamble_sync
|
||||
|
||||
PocsagDecoder dec;
|
||||
public:
|
||||
preamble_sync_impl();
|
||||
~preamble_sync_impl();
|
||||
pocsag_decoder_impl();
|
||||
~pocsag_decoder_impl();
|
||||
|
||||
// Where all the action really happens
|
||||
void forecast (int noutput_items, gr_vector_int &ninput_items_required);
|
||||
@@ -72,5 +72,5 @@ class preamble_sync_impl : public preamble_sync
|
||||
} // namespace jay
|
||||
} // namespace gr
|
||||
|
||||
#endif /* INCLUDED_JAY_PREAMBLE_SYNC_IMPL_H */
|
||||
#endif /* INCLUDED_JAY_POCSAG_DECODER_IMPL_H */
|
||||
|
||||
Reference in New Issue
Block a user