提交 1f901e9e 编写于 作者: M manjaro-xfce

解决变量初始化、定时问题。

上级 4f6df53e
......@@ -23,9 +23,9 @@ protected:
public:
std::string m_filter;
std::string m_device;
std::atomic<unsigned long long> m_rx;
int m_nInstance;
int m_nSubject;
std::atomic<unsigned long long> m_rx = 0;
int m_nInstance = 0;
int m_nSubject = 0;
signals:
void sig_message(QString msg);
};
......
......@@ -444,8 +444,8 @@ int do_iio(const cmdlineParser & args)
std::function<void()> thread_stdout = [&]()->void
{
try{
//Read, RX
unsigned int ct_br = 0;
//Read, RX
while (!stop_signal_called)
{
if (stdout_pos >= rx_pos)
......@@ -626,7 +626,7 @@ int do_iio(const cmdlineParser & args)
UHD_DO(uhd_tx_streamer_send(tx_streamer,
(const void **)tx_buff_ptr.data(),
tx_sps_buff, &tx_meta,0.1, &num_sps_sent));
//tx_meta->tx_metadata_cpp.start_of_burst = false;
//tx_meta->tx_metadata_ctmstmppp.start_of_burst = false;
for(int ch = 0;ch<tx_channel_count;++ch)
tx_pos[ch] += num_sps_sent;
}
......@@ -643,11 +643,15 @@ int do_iio(const cmdlineParser & args)
{
if (total_points_left <= (qint64)tx_sps_buff)
{
UHD_DO(uhd_tx_metadata_make(&tx_meta_burst,true,plan->tmstmp.sec,plan->tmstmp.frag,true,true));
UHD_DO(uhd_tx_metadata_make(&tx_meta_burst,
plan->tmstmp.sec?true:false,
plan->tmstmp.sec,plan->tmstmp.frag,true,true));
}
else
{
UHD_DO(uhd_tx_metadata_make(&tx_meta_burst,true,plan->tmstmp.sec,plan->tmstmp.frag,true,false));
UHD_DO(uhd_tx_metadata_make(&tx_meta_burst,
plan->tmstmp.sec?true:false,
plan->tmstmp.sec,plan->tmstmp.frag,true,false));
}
}
//Last pack
......@@ -758,6 +762,7 @@ void cmd_dealing(uhd_usrp_handle usrp,std::vector<unsigned char> & cmd)
double dgain = 0;
uhd_usrp_get_rx_gain(usrp, channel, "", &dgain);
fprintf(stderr, "Actual RX Gain: %lf...\n", dgain);
}
else if (mcmd["handle"].find("txgain_")!=mcmd["handle"].npos)
{
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册