#include "signalbase.hpp"
#include "signaldata.hpp"
+#include <QDebug>
+
#include <pv/binding/decoder.hpp>
#include <pv/session.hpp>
using std::dynamic_pointer_cast;
using std::make_shared;
+using std::out_of_range;
using std::shared_ptr;
using std::tie;
using std::unique_lock;
const int SignalBase::ColourBGAlpha = 8 * 256 / 100;
const uint64_t SignalBase::ConversionBlockSize = 4096;
+const uint32_t SignalBase::ConversionDelay = 1000; // 1 second
SignalBase::SignalBase(shared_ptr<sigrok::Channel> channel, ChannelType channel_type) :
channel_(channel),
{
if (channel_)
internal_name_ = QString::fromStdString(channel_->name());
+
+ connect(&delayed_conversion_starter_, SIGNAL(timeout()),
+ this, SLOT(on_delayed_conversion_start()));
+ delayed_conversion_starter_.setSingleShot(true);
+ delayed_conversion_starter_.setInterval(ConversionDelay);
}
SignalBase::~SignalBase()
return internal_name_;
}
+QString SignalBase::display_name() const
+{
+ if (name() != internal_name_)
+ return name() + " (" + internal_name_ + ")";
+ else
+ return name();
+}
+
void SignalBase::set_name(QString name)
{
if (channel_)
return result;
}
+bool SignalBase::segment_is_complete(uint32_t segment_id) const
+{
+ bool result = true;
+
+ if (channel_type_ == AnalogChannel)
+ {
+ shared_ptr<Analog> data = dynamic_pointer_cast<Analog>(data_);
+ auto segments = data->analog_segments();
+ try {
+ result = segments.at(segment_id)->is_complete();
+ } catch (out_of_range) {
+ // Do nothing
+ }
+ }
+
+ if (channel_type_ == LogicChannel)
+ {
+ shared_ptr<Logic> data = dynamic_pointer_cast<Logic>(data_);
+ auto segments = data->logic_segments();
+ try {
+ result = segments.at(segment_id)->is_complete();
+ } catch (out_of_range) {
+ // Do nothing
+ }
+ }
+
+ return result;
+}
+
SignalBase::ConversionType SignalBase::get_conversion_type() const
{
return conversion_type_;
if (preset != conversion_options_.end())
return (ConversionPreset)((preset->second).toInt());
- return NoPreset;
+ return DynamicPreset;
}
void SignalBase::set_conversion_preset(ConversionPreset id)
(conversion_type_ == A2LConversionBySchmittTrigger)));
}
-void SignalBase::conversion_thread_proc(QObject* segment)
+void SignalBase::convert_single_segment(AnalogSegment *asegment, LogicSegment *lsegment)
{
- // TODO Support for multiple segments is missing
-
uint64_t start_sample, end_sample;
start_sample = end_sample = 0;
- do {
- if (conversion_is_a2l()) {
+ start_sample = lsegment->get_sample_count();
+ end_sample = asegment->get_sample_count();
- AnalogSegment *asegment = qobject_cast<AnalogSegment*>(segment);
+ if (end_sample > start_sample) {
+ tie(min_value_, max_value_) = asegment->get_min_max();
- const shared_ptr<Logic> logic_data = dynamic_pointer_cast<Logic>(converted_data_);
+ // Create sigrok::Analog instance
+ float *asamples = new float[ConversionBlockSize];
+ uint8_t *lsamples = new uint8_t[ConversionBlockSize];
- // Create the initial logic data segment if needed
- if (logic_data->segments().size() == 0) {
- shared_ptr<LogicSegment> lsegment =
- make_shared<LogicSegment>(*logic_data.get(), 1, asegment->samplerate());
- logic_data->push_segment(lsegment);
- }
+ vector<shared_ptr<sigrok::Channel> > channels;
+ channels.push_back(channel_);
- LogicSegment *lsegment = dynamic_cast<LogicSegment*>(logic_data->segments().front().get());
+ vector<const sigrok::QuantityFlag*> mq_flags;
+ const sigrok::Quantity * const mq = sigrok::Quantity::VOLTAGE;
+ const sigrok::Unit * const unit = sigrok::Unit::VOLT;
- start_sample = lsegment->get_sample_count();
- end_sample = asegment->get_sample_count();
+ shared_ptr<sigrok::Packet> packet =
+ Session::sr_context->create_analog_packet(channels,
+ asamples, ConversionBlockSize, mq, unit, mq_flags);
- if (end_sample > start_sample) {
- tie(min_value_, max_value_) = asegment->get_min_max();
+ shared_ptr<sigrok::Analog> analog =
+ dynamic_pointer_cast<sigrok::Analog>(packet->payload());
- // Create sigrok::Analog instance
- float *asamples = new float[ConversionBlockSize];
- uint8_t *lsamples = new uint8_t[ConversionBlockSize];
+ // Convert
+ uint64_t i = start_sample;
- vector<shared_ptr<sigrok::Channel> > channels;
- channels.push_back(channel_);
+ if (conversion_type_ == A2LConversionByThreshold) {
+ const double threshold = get_conversion_thresholds()[0];
- vector<const sigrok::QuantityFlag*> mq_flags;
- const sigrok::Quantity * const mq = sigrok::Quantity::VOLTAGE;
- const sigrok::Unit * const unit = sigrok::Unit::VOLT;
+ // Convert as many sample blocks as we can
+ while ((end_sample - i) > ConversionBlockSize) {
+ asegment->get_samples(i, i + ConversionBlockSize, asamples);
- shared_ptr<sigrok::Packet> packet =
- Session::sr_context->create_analog_packet(channels,
- asamples, ConversionBlockSize, mq, unit, mq_flags);
+ shared_ptr<sigrok::Logic> logic =
+ analog->get_logic_via_threshold(threshold, lsamples);
- shared_ptr<sigrok::Analog> analog =
- dynamic_pointer_cast<sigrok::Analog>(packet->payload());
+ lsegment->append_payload(logic->data_pointer(), logic->data_length());
+ samples_added(lsegment->segment_id(), i, i + ConversionBlockSize);
+ i += ConversionBlockSize;
+ }
- // Convert
- uint64_t i = start_sample;
+ // Re-create sigrok::Analog and convert remaining samples
+ packet = Session::sr_context->create_analog_packet(channels,
+ asamples, end_sample - i, mq, unit, mq_flags);
- if (conversion_type_ == A2LConversionByThreshold) {
- const double threshold = get_conversion_thresholds()[0];
+ analog = dynamic_pointer_cast<sigrok::Analog>(packet->payload());
- // Convert as many sample blocks as we can
- while ((end_sample - i) > ConversionBlockSize) {
- asegment->get_samples(i, i + ConversionBlockSize, asamples);
+ asegment->get_samples(i, end_sample, asamples);
+ shared_ptr<sigrok::Logic> logic =
+ analog->get_logic_via_threshold(threshold, lsamples);
+ lsegment->append_payload(logic->data_pointer(), logic->data_length());
+ samples_added(lsegment->segment_id(), i, end_sample);
+ }
+
+ if (conversion_type_ == A2LConversionBySchmittTrigger) {
+ const vector<double> thresholds = get_conversion_thresholds();
+ const double lo_thr = thresholds[0];
+ const double hi_thr = thresholds[1];
- shared_ptr<sigrok::Logic> logic =
- analog->get_logic_via_threshold(threshold, lsamples);
+ uint8_t state = 0; // TODO Use value of logic sample n-1 instead of 0
- lsegment->append_payload(logic->data_pointer(), logic->data_length());
+ // Convert as many sample blocks as we can
+ while ((end_sample - i) > ConversionBlockSize) {
+ asegment->get_samples(i, i + ConversionBlockSize, asamples);
- samples_added(lsegment, i, i + ConversionBlockSize);
- i += ConversionBlockSize;
- }
+ shared_ptr<sigrok::Logic> logic =
+ analog->get_logic_via_schmitt_trigger(lo_thr, hi_thr,
+ &state, lsamples);
+
+ lsegment->append_payload(logic->data_pointer(), logic->data_length());
+ samples_added(lsegment->segment_id(), i, i + ConversionBlockSize);
+ i += ConversionBlockSize;
+ }
- // Re-create sigrok::Analog and convert remaining samples
- packet = Session::sr_context->create_analog_packet(channels,
- asamples, end_sample - i, mq, unit, mq_flags);
+ // Re-create sigrok::Analog and convert remaining samples
+ packet = Session::sr_context->create_analog_packet(channels,
+ asamples, end_sample - i, mq, unit, mq_flags);
+
+ analog = dynamic_pointer_cast<sigrok::Analog>(packet->payload());
+
+ asegment->get_samples(i, end_sample, asamples);
+ shared_ptr<sigrok::Logic> logic =
+ analog->get_logic_via_schmitt_trigger(lo_thr, hi_thr,
+ &state, lsamples);
+ lsegment->append_payload(logic->data_pointer(), logic->data_length());
+ samples_added(lsegment->segment_id(), i, end_sample);
+ }
- analog = dynamic_pointer_cast<sigrok::Analog>(packet->payload());
+ // If acquisition is ongoing, start-/endsample may have changed
+ end_sample = asegment->get_sample_count();
- asegment->get_samples(i, end_sample, asamples);
- shared_ptr<sigrok::Logic> logic =
- analog->get_logic_via_threshold(threshold, lsamples);
- lsegment->append_payload(logic->data_pointer(), logic->data_length());
- samples_added(lsegment, i, end_sample);
- }
+ delete[] lsamples;
+ delete[] asamples;
+ }
+}
- if (conversion_type_ == A2LConversionBySchmittTrigger) {
- const vector<double> thresholds = get_conversion_thresholds();
- const double lo_thr = thresholds[0];
- const double hi_thr = thresholds[1];
+void SignalBase::conversion_thread_proc()
+{
+ shared_ptr<Analog> analog_data;
- uint8_t state = 0; // TODO Use value of logic sample n-1 instead of 0
+ if (conversion_is_a2l()) {
+ analog_data = dynamic_pointer_cast<Analog>(data_);
- // Convert as many sample blocks as we can
- while ((end_sample - i) > ConversionBlockSize) {
- asegment->get_samples(i, i + ConversionBlockSize, asamples);
+ if (analog_data->analog_segments().size() == 0) {
+ unique_lock<mutex> input_lock(conversion_input_mutex_);
+ conversion_input_cond_.wait(input_lock);
+ }
- shared_ptr<sigrok::Logic> logic =
- analog->get_logic_via_schmitt_trigger(lo_thr, hi_thr,
- &state, lsamples);
+ } else
+ // Currently, we only handle A2L conversions
+ return;
- lsegment->append_payload(logic->data_pointer(), logic->data_length());
+ // If we had to wait for input data, we may have been notified to terminate
+ if (conversion_interrupt_)
+ return;
- samples_added(lsegment, i, i + ConversionBlockSize);
- i += ConversionBlockSize;
- }
+ uint32_t segment_id = 0;
- // Re-create sigrok::Analog and convert remaining samples
- packet = Session::sr_context->create_analog_packet(channels,
- asamples, end_sample - i, mq, unit, mq_flags);
+ AnalogSegment *asegment = analog_data->analog_segments().front().get();
+ assert(asegment);
- analog = dynamic_pointer_cast<sigrok::Analog>(packet->payload());
+ const shared_ptr<Logic> logic_data = dynamic_pointer_cast<Logic>(converted_data_);
+ assert(logic_data);
- asegment->get_samples(i, end_sample, asamples);
- shared_ptr<sigrok::Logic> logic =
- analog->get_logic_via_schmitt_trigger(lo_thr, hi_thr,
- &state, lsamples);
- lsegment->append_payload(logic->data_pointer(), logic->data_length());
- samples_added(lsegment, i, end_sample);
- }
+ // Create the initial logic data segment if needed
+ if (logic_data->logic_segments().size() == 0) {
+ shared_ptr<LogicSegment> new_segment =
+ make_shared<LogicSegment>(*logic_data.get(), 0, 1, asegment->samplerate());
+ logic_data->push_segment(new_segment);
+ }
- // If acquisition is ongoing, start-/endsample may have changed
- end_sample = asegment->get_sample_count();
+ LogicSegment *lsegment = logic_data->logic_segments().front().get();
+ assert(lsegment);
- delete[] lsamples;
- delete[] asamples;
+ do {
+ convert_single_segment(asegment, lsegment);
+
+ if (analog_data->analog_segments().size() > logic_data->logic_segments().size()) {
+ // There are more segments to process
+ segment_id++;
+
+ try {
+ asegment = analog_data->analog_segments().at(segment_id).get();
+ } catch (out_of_range) {
+ qDebug() << "Conversion error for" << name() << ": no analog segment" \
+ << segment_id << ", segments size is" << analog_data->analog_segments().size();
+ return;
}
- }
- if (!conversion_interrupt_ && (start_sample == end_sample)) {
- unique_lock<mutex> input_lock(conversion_input_mutex_);
- conversion_input_cond_.wait(input_lock);
+ shared_ptr<LogicSegment> new_segment = make_shared<LogicSegment>(
+ *logic_data.get(), segment_id, 1, asegment->samplerate());
+ logic_data->push_segment(new_segment);
+
+ lsegment = logic_data->logic_segments().back().get();
+ } else {
+ // No more segments to process, wait for data or interrupt
+ if (!conversion_interrupt_) {
+ unique_lock<mutex> input_lock(conversion_input_mutex_);
+ conversion_input_cond_.wait(input_lock);
+ }
}
} while (!conversion_interrupt_);
}
-void SignalBase::start_conversion()
+void SignalBase::start_conversion(bool delayed_start)
{
+ if (delayed_start) {
+ delayed_conversion_starter_.start();
+ return;
+ }
+
stop_conversion();
if (converted_data_)
converted_data_->clear();
+ samples_cleared();
- if (conversion_is_a2l()) {
- shared_ptr<Analog> analog_data = dynamic_pointer_cast<Analog>(data_);
-
- if (analog_data->analog_segments().size() > 0) {
- // TODO Support for multiple segments is missing
- AnalogSegment *asegment = analog_data->analog_segments().front().get();
-
- conversion_interrupt_ = false;
- conversion_thread_ = std::thread(
- &SignalBase::conversion_thread_proc, this, asegment);
- }
- }
+ conversion_interrupt_ = false;
+ conversion_thread_ = std::thread(
+ &SignalBase::conversion_thread_proc, this);
}
void SignalBase::stop_conversion()
// Notify the conversion thread since it's running
conversion_input_cond_.notify_one();
} else {
- // Start the conversion thread
- start_conversion();
+ // Start the conversion thread unless the delay timer is running
+ if (!delayed_conversion_starter_.isActive())
+ start_conversion();
}
}
- samples_added(segment, start_sample, end_sample);
+ data::Segment* s = qobject_cast<data::Segment*>(segment);
+ samples_added(s->segment_id(), start_sample, end_sample);
}
void SignalBase::on_min_max_changed(float min, float max)
{
- (void)min;
- (void)max;
-
// Restart conversion if one is enabled and uses a calculated threshold
if ((conversion_type_ != NoConversion) &&
(get_current_conversion_preset() == DynamicPreset))
- start_conversion();
+ start_conversion(true);
+
+ min_max_changed(min, max);
}
void SignalBase::on_capture_state_changed(int state)
}
}
+void SignalBase::on_delayed_conversion_start()
+{
+ start_conversion();
+}
+
} // namespace data
} // namespace pv
projects / pulseview.git / blobdiff