mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2025-01-31 11:19:18 +00:00
Return the right item_size
This commit is contained in:
parent
63b7c00b16
commit
660dd594dc
@ -21,6 +21,7 @@
|
|||||||
#ifndef GNSS_SDR_RTKLIB_PVT_H
|
#ifndef GNSS_SDR_RTKLIB_PVT_H
|
||||||
#define GNSS_SDR_RTKLIB_PVT_H
|
#define GNSS_SDR_RTKLIB_PVT_H
|
||||||
|
|
||||||
|
#include "gnss_synchro.h"
|
||||||
#include "pvt_interface.h" // for PvtInterface
|
#include "pvt_interface.h" // for PvtInterface
|
||||||
#include "rtklib.h" // for rtk_t
|
#include "rtklib.h" // for rtk_t
|
||||||
#include "rtklib_pvt_gs.h" // for rtklib_pvt_gs_sptr
|
#include "rtklib_pvt_gs.h" // for rtklib_pvt_gs_sptr
|
||||||
@ -77,10 +78,10 @@ public:
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
//! All blocks must have an item_size() function implementation. Returns sizeof(gr_complex)
|
//! All blocks must have an item_size() function implementation
|
||||||
inline size_t item_size() override
|
inline size_t item_size() override
|
||||||
{
|
{
|
||||||
return sizeof(gr_complex);
|
return sizeof(Gnss_Synchro);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool get_latest_PVT(double* longitude_deg,
|
bool get_latest_PVT(double* longitude_deg,
|
||||||
|
@ -28,6 +28,7 @@ target_include_directories(obs_adapters
|
|||||||
target_link_libraries(obs_adapters
|
target_link_libraries(obs_adapters
|
||||||
PUBLIC
|
PUBLIC
|
||||||
obs_gr_blocks
|
obs_gr_blocks
|
||||||
|
core_system_parameters
|
||||||
PRIVATE
|
PRIVATE
|
||||||
gnss_sdr_flags
|
gnss_sdr_flags
|
||||||
Glog::glog
|
Glog::glog
|
||||||
|
@ -23,6 +23,7 @@
|
|||||||
#ifndef GNSS_SDR_HYBRID_OBSERVABLES_H
|
#ifndef GNSS_SDR_HYBRID_OBSERVABLES_H
|
||||||
#define GNSS_SDR_HYBRID_OBSERVABLES_H
|
#define GNSS_SDR_HYBRID_OBSERVABLES_H
|
||||||
|
|
||||||
|
#include "gnss_synchro.h"
|
||||||
#include "hybrid_observables_gs.h"
|
#include "hybrid_observables_gs.h"
|
||||||
#include "observables_interface.h"
|
#include "observables_interface.h"
|
||||||
#include <gnuradio/gr_complex.h> // for gr_complex
|
#include <gnuradio/gr_complex.h> // for gr_complex
|
||||||
@ -69,7 +70,7 @@ public:
|
|||||||
//! All blocks must have an item_size() function implementation
|
//! All blocks must have an item_size() function implementation
|
||||||
inline size_t item_size() override
|
inline size_t item_size() override
|
||||||
{
|
{
|
||||||
return sizeof(gr_complex);
|
return sizeof(Gnss_Synchro);
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
@ -25,6 +25,7 @@
|
|||||||
|
|
||||||
#include "beidou_b1i_telemetry_decoder_gs.h"
|
#include "beidou_b1i_telemetry_decoder_gs.h"
|
||||||
#include "gnss_satellite.h" // for Gnss_Satellite
|
#include "gnss_satellite.h" // for Gnss_Satellite
|
||||||
|
#include "gnss_synchro.h"
|
||||||
#include "telemetry_decoder_interface.h"
|
#include "telemetry_decoder_interface.h"
|
||||||
#include <gnuradio/runtime_types.h> // for basic_block_sptr, top_block_sptr
|
#include <gnuradio/runtime_types.h> // for basic_block_sptr, top_block_sptr
|
||||||
#include <cstddef> // for size_t
|
#include <cstddef> // for size_t
|
||||||
@ -72,7 +73,7 @@ public:
|
|||||||
|
|
||||||
inline size_t item_size() override
|
inline size_t item_size() override
|
||||||
{
|
{
|
||||||
return 0;
|
return sizeof(Gnss_Synchro);
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
@ -23,6 +23,7 @@
|
|||||||
|
|
||||||
#include "beidou_b3i_telemetry_decoder_gs.h"
|
#include "beidou_b3i_telemetry_decoder_gs.h"
|
||||||
#include "gnss_satellite.h" // for Gnss_Satellite
|
#include "gnss_satellite.h" // for Gnss_Satellite
|
||||||
|
#include "gnss_synchro.h"
|
||||||
#include "telemetry_decoder_interface.h"
|
#include "telemetry_decoder_interface.h"
|
||||||
#include <gnuradio/runtime_types.h> // for basic_block_sptr, top_block_sptr
|
#include <gnuradio/runtime_types.h> // for basic_block_sptr, top_block_sptr
|
||||||
#include <cstddef> // for size_t
|
#include <cstddef> // for size_t
|
||||||
@ -67,7 +68,7 @@ public:
|
|||||||
telemetry_decoder_->reset();
|
telemetry_decoder_->reset();
|
||||||
}
|
}
|
||||||
|
|
||||||
inline size_t item_size() override { return 0; }
|
inline size_t item_size() override { return sizeof(Gnss_Synchro); }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
beidou_b3i_telemetry_decoder_gs_sptr telemetry_decoder_;
|
beidou_b3i_telemetry_decoder_gs_sptr telemetry_decoder_;
|
||||||
|
@ -26,6 +26,7 @@
|
|||||||
|
|
||||||
#include "galileo_telemetry_decoder_gs.h"
|
#include "galileo_telemetry_decoder_gs.h"
|
||||||
#include "gnss_satellite.h"
|
#include "gnss_satellite.h"
|
||||||
|
#include "gnss_synchro.h"
|
||||||
#include "telemetry_decoder_interface.h"
|
#include "telemetry_decoder_interface.h"
|
||||||
#include <gnuradio/runtime_types.h> // for basic_block_sptr, top_block_sptr
|
#include <gnuradio/runtime_types.h> // for basic_block_sptr, top_block_sptr
|
||||||
#include <cstddef> // for size_t
|
#include <cstddef> // for size_t
|
||||||
@ -76,7 +77,7 @@ public:
|
|||||||
|
|
||||||
inline size_t item_size() override
|
inline size_t item_size() override
|
||||||
{
|
{
|
||||||
return 0;
|
return sizeof(Gnss_Synchro);
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
@ -28,6 +28,7 @@
|
|||||||
|
|
||||||
#include "galileo_telemetry_decoder_gs.h"
|
#include "galileo_telemetry_decoder_gs.h"
|
||||||
#include "gnss_satellite.h" // for Gnss_Satellite
|
#include "gnss_satellite.h" // for Gnss_Satellite
|
||||||
|
#include "gnss_synchro.h"
|
||||||
#include "telemetry_decoder_interface.h"
|
#include "telemetry_decoder_interface.h"
|
||||||
#include <gnuradio/runtime_types.h> // for basic_block_sptr, top_block_sptr
|
#include <gnuradio/runtime_types.h> // for basic_block_sptr, top_block_sptr
|
||||||
#include <cstddef> // for size_t
|
#include <cstddef> // for size_t
|
||||||
@ -77,7 +78,7 @@ public:
|
|||||||
|
|
||||||
inline size_t item_size() override
|
inline size_t item_size() override
|
||||||
{
|
{
|
||||||
return 0;
|
return sizeof(Gnss_Synchro);
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
@ -25,6 +25,7 @@
|
|||||||
|
|
||||||
#include "glonass_l1_ca_telemetry_decoder_gs.h"
|
#include "glonass_l1_ca_telemetry_decoder_gs.h"
|
||||||
#include "gnss_satellite.h" // for Gnss_Satellite
|
#include "gnss_satellite.h" // for Gnss_Satellite
|
||||||
|
#include "gnss_synchro.h"
|
||||||
#include "telemetry_decoder_interface.h"
|
#include "telemetry_decoder_interface.h"
|
||||||
#include <gnuradio/runtime_types.h> // for basic_block_sptr, top_block_sptr
|
#include <gnuradio/runtime_types.h> // for basic_block_sptr, top_block_sptr
|
||||||
#include <cstddef> // for size_t
|
#include <cstddef> // for size_t
|
||||||
@ -71,7 +72,7 @@ public:
|
|||||||
|
|
||||||
inline size_t item_size() override
|
inline size_t item_size() override
|
||||||
{
|
{
|
||||||
return 0;
|
return sizeof(Gnss_Synchro);
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
@ -24,6 +24,7 @@
|
|||||||
|
|
||||||
#include "glonass_l2_ca_telemetry_decoder_gs.h"
|
#include "glonass_l2_ca_telemetry_decoder_gs.h"
|
||||||
#include "gnss_satellite.h" // for Gnss_Satellite
|
#include "gnss_satellite.h" // for Gnss_Satellite
|
||||||
|
#include "gnss_synchro.h"
|
||||||
#include "telemetry_decoder_interface.h"
|
#include "telemetry_decoder_interface.h"
|
||||||
#include <gnuradio/runtime_types.h> // for basic_block_sptr, top_block_sptr
|
#include <gnuradio/runtime_types.h> // for basic_block_sptr, top_block_sptr
|
||||||
#include <cstddef> // for size_t
|
#include <cstddef> // for size_t
|
||||||
@ -70,7 +71,7 @@ public:
|
|||||||
|
|
||||||
inline size_t item_size() override
|
inline size_t item_size() override
|
||||||
{
|
{
|
||||||
return 0;
|
return sizeof(Gnss_Synchro);
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
@ -23,6 +23,7 @@
|
|||||||
#define GNSS_SDR_GPS_L1_CA_TELEMETRY_DECODER_H
|
#define GNSS_SDR_GPS_L1_CA_TELEMETRY_DECODER_H
|
||||||
|
|
||||||
#include "gnss_satellite.h" // for Gnss_Satellite
|
#include "gnss_satellite.h" // for Gnss_Satellite
|
||||||
|
#include "gnss_synchro.h"
|
||||||
#include "gps_l1_ca_telemetry_decoder_gs.h"
|
#include "gps_l1_ca_telemetry_decoder_gs.h"
|
||||||
#include "telemetry_decoder_interface.h"
|
#include "telemetry_decoder_interface.h"
|
||||||
#include <gnuradio/runtime_types.h> // for basic_block_sptr, top_block_sptr
|
#include <gnuradio/runtime_types.h> // for basic_block_sptr, top_block_sptr
|
||||||
@ -71,7 +72,7 @@ public:
|
|||||||
|
|
||||||
inline size_t item_size() override
|
inline size_t item_size() override
|
||||||
{
|
{
|
||||||
return 0;
|
return sizeof(Gnss_Synchro);
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
@ -23,6 +23,7 @@
|
|||||||
#define GNSS_SDR_GPS_L2C_TELEMETRY_DECODER_H
|
#define GNSS_SDR_GPS_L2C_TELEMETRY_DECODER_H
|
||||||
|
|
||||||
#include "gnss_satellite.h" // for Gnss_Satellite
|
#include "gnss_satellite.h" // for Gnss_Satellite
|
||||||
|
#include "gnss_synchro.h"
|
||||||
#include "gps_l2c_telemetry_decoder_gs.h"
|
#include "gps_l2c_telemetry_decoder_gs.h"
|
||||||
#include "telemetry_decoder_interface.h"
|
#include "telemetry_decoder_interface.h"
|
||||||
#include <gnuradio/runtime_types.h> // for basic_block_sptr, top_block_sptr
|
#include <gnuradio/runtime_types.h> // for basic_block_sptr, top_block_sptr
|
||||||
@ -71,7 +72,7 @@ public:
|
|||||||
|
|
||||||
inline size_t item_size() override
|
inline size_t item_size() override
|
||||||
{
|
{
|
||||||
return 0;
|
return sizeof(Gnss_Synchro);
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
@ -24,6 +24,7 @@
|
|||||||
|
|
||||||
|
|
||||||
#include "gnss_satellite.h"
|
#include "gnss_satellite.h"
|
||||||
|
#include "gnss_synchro.h"
|
||||||
#include "gps_l5_telemetry_decoder_gs.h"
|
#include "gps_l5_telemetry_decoder_gs.h"
|
||||||
#include "telemetry_decoder_interface.h"
|
#include "telemetry_decoder_interface.h"
|
||||||
#include <gnuradio/runtime_types.h> // for basic_block_sptr, top_block_sptr
|
#include <gnuradio/runtime_types.h> // for basic_block_sptr, top_block_sptr
|
||||||
@ -73,7 +74,7 @@ public:
|
|||||||
|
|
||||||
inline size_t item_size() override
|
inline size_t item_size() override
|
||||||
{
|
{
|
||||||
return 0;
|
return sizeof(Gnss_Synchro);
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
@ -24,6 +24,7 @@
|
|||||||
|
|
||||||
|
|
||||||
#include "gnss_satellite.h" // for Gnss_Satellite
|
#include "gnss_satellite.h" // for Gnss_Satellite
|
||||||
|
#include "gnss_synchro.h"
|
||||||
#include "sbas_l1_telemetry_decoder_gs.h"
|
#include "sbas_l1_telemetry_decoder_gs.h"
|
||||||
#include "telemetry_decoder_interface.h"
|
#include "telemetry_decoder_interface.h"
|
||||||
#include <gnuradio/runtime_types.h> // for basic_block_sptr, top_block_sptr
|
#include <gnuradio/runtime_types.h> // for basic_block_sptr, top_block_sptr
|
||||||
@ -65,27 +66,28 @@ public:
|
|||||||
gr::basic_block_sptr get_right_block() override;
|
gr::basic_block_sptr get_right_block() override;
|
||||||
|
|
||||||
void set_satellite(const Gnss_Satellite& satellite) override;
|
void set_satellite(const Gnss_Satellite& satellite) override;
|
||||||
|
|
||||||
inline void set_channel(int channel) override { telemetry_decoder_->set_channel(channel); }
|
inline void set_channel(int channel) override { telemetry_decoder_->set_channel(channel); }
|
||||||
|
|
||||||
inline void reset() override
|
inline void reset() override
|
||||||
{
|
{
|
||||||
telemetry_decoder_->reset();
|
telemetry_decoder_->reset();
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
inline size_t item_size() override
|
inline size_t item_size() override
|
||||||
{
|
{
|
||||||
return 0;
|
return sizeof(Gnss_Synchro);
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
sbas_l1_telemetry_decoder_gs_sptr telemetry_decoder_;
|
sbas_l1_telemetry_decoder_gs_sptr telemetry_decoder_;
|
||||||
Gnss_Satellite satellite_;
|
Gnss_Satellite satellite_;
|
||||||
int channel_;
|
|
||||||
bool dump_;
|
|
||||||
std::string dump_filename_;
|
std::string dump_filename_;
|
||||||
std::string role_;
|
std::string role_;
|
||||||
|
int channel_;
|
||||||
unsigned int in_streams_;
|
unsigned int in_streams_;
|
||||||
unsigned int out_streams_;
|
unsigned int out_streams_;
|
||||||
|
bool dump_;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user