#include "analog.hpp"
#include "analogsegment.hpp"
+#include "decode/row.hpp"
#include "logic.hpp"
#include "logicsegment.hpp"
#include "signalbase.hpp"
#include "signaldata.hpp"
-#include "decode/row.hpp"
-#include <pv/session.hpp>
#include <pv/binding/decoder.hpp>
+#include <pv/session.hpp>
using std::dynamic_pointer_cast;
using std::make_shared;
void SignalBase::set_data(shared_ptr<pv::data::SignalData> data)
{
- if (data_ && channel_type_ == AnalogChannel) {
- shared_ptr<Analog> analog_data = dynamic_pointer_cast<Analog>(data_);
-
- disconnect(analog_data.get(), SIGNAL(samples_cleared()),
+ if (data_) {
+ disconnect(data.get(), SIGNAL(samples_cleared()),
this, SLOT(on_samples_cleared()));
- disconnect(analog_data.get(), SIGNAL(samples_added(QObject*, uint64_t, uint64_t)),
+ disconnect(data.get(), SIGNAL(samples_added(QObject*, uint64_t, uint64_t)),
this, SLOT(on_samples_added(QObject*, uint64_t, uint64_t)));
}
data_ = data;
- if (data_ && channel_type_ == AnalogChannel) {
- shared_ptr<Analog> analog_data = dynamic_pointer_cast<Analog>(data_);
-
- connect(analog_data.get(), SIGNAL(samples_cleared()),
+ if (data_) {
+ connect(data.get(), SIGNAL(samples_cleared()),
this, SLOT(on_samples_cleared()));
- connect(analog_data.get(), SIGNAL(samples_added(QObject*, uint64_t, uint64_t)),
+ connect(data.get(), SIGNAL(samples_added(QObject*, uint64_t, uint64_t)),
this, SLOT(on_samples_added(QObject*, uint64_t, uint64_t)));
}
}
return (value >= threshold) ? 1 : 0;
}
-uint8_t SignalBase::convert_a2l_schmitt_trigger(float lo_thr, float hi_thr, float value)
+uint8_t SignalBase::convert_a2l_schmitt_trigger(float lo_thr, float hi_thr,
+ float value, uint8_t &state)
{
- static uint8_t state = 0;
-
if (value < lo_thr)
state = 0;
else if (value > hi_thr)
lsamples.push_back(convert_a2l_threshold(threshold, asamples[j]));
lsegment->append_payload(lsamples.data(), lsamples.size());
delete[] asamples;
+
+ samples_added(lsegment, start_sample, end_sample);
}
if (conversion_type_ == A2LConversionBySchmittTrigger) {
const float amplitude = max_v - min_v;
const float lo_thr = min_v + (amplitude * 0.1); // 10% above min
const float hi_thr = max_v - (amplitude * 0.1); // 10% below max
+ uint8_t state = 0; // TODO Use value of logic sample n-1 instead of 0
// Convert as many sample blocks as we can
while ((end_sample - i) > block_size) {
const float* asamples = asegment->get_samples(i, i + block_size);
for (uint32_t j = 0; j < block_size; j++)
- lsamples.push_back(convert_a2l_schmitt_trigger(lo_thr, hi_thr, asamples[j]));
+ lsamples.push_back(convert_a2l_schmitt_trigger(lo_thr, hi_thr, asamples[j], state));
lsegment->append_payload(lsamples.data(), lsamples.size());
i += block_size;
lsamples.clear();
// Convert remaining samples
const float* asamples = asegment->get_samples(i, end_sample);
for (uint32_t j = 0; j < (end_sample - i); j++)
- lsamples.push_back(convert_a2l_schmitt_trigger(lo_thr, hi_thr, asamples[j]));
+ lsamples.push_back(convert_a2l_schmitt_trigger(lo_thr, hi_thr, asamples[j], state));
lsegment->append_payload(lsamples.data(), lsamples.size());
delete[] asamples;
+
+ samples_added(lsegment, start_sample, end_sample);
}
}
}
{
if (converted_data_)
converted_data_->clear();
+
+ samples_cleared();
}
void SignalBase::on_samples_added(QObject* segment, uint64_t start_sample,
uint64_t end_sample)
{
- (void)segment;
- (void)start_sample;
- (void)end_sample;
-
if (conversion_type_ != NoConversion) {
// Wait for the currently ongoing conversion to finish
&SignalBase::conversion_thread_proc, this,
segment, start_sample, end_sample);
}
+
+ samples_added(segment, start_sample, end_sample);
}
void SignalBase::on_capture_state_changed(int state)