diff --git a/DSLogic-gui/cmake_modules/Findlibusb-1.0.cmake b/DSLogic-gui/cmake_modules/Findlibusb-1.0.cmake deleted file mode 100644 index 5c831485..00000000 --- a/DSLogic-gui/cmake_modules/Findlibusb-1.0.cmake +++ /dev/null @@ -1,64 +0,0 @@ -# -# LIBUSB_1_FOUND - system has libusb -# LIBUSB_1_INCLUDE_DIRS - the libusb include directory -# LIBUSB_1_LIBRARIES - Link these to use libusb -# LIBUSB_1_DEFINITIONS - Compiler switches required for using libusb -# -# Adapted from cmake-modules Google Code project -# -# Copyright (c) 2006 Andreas Schneider -# -# (Changes for libusb) Copyright (c) 2008 Kyle Machulis -# -# Redistribution and use is allowed according to the terms of the New BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. -# - - -if (LIBUSB_1_LIBRARIES AND LIBUSB_1_INCLUDE_DIRS) - # in cache already - set(LIBUSB_FOUND TRUE) -else (LIBUSB_1_LIBRARIES AND LIBUSB_1_INCLUDE_DIRS) - find_path(LIBUSB_1_INCLUDE_DIR - NAMES -libusb-1.0/libusb.h - PATHS - /usr/local/include -PATH_SUFFIXES -libusb-1.0 - ) - - find_library(LIBUSB_1_LIBRARY - NAMES - usb-1.0 - PATHS - /usr/local/lib - ) - - set(LIBUSB_1_INCLUDE_DIRS - ${LIBUSB_1_INCLUDE_DIR} - ) - set(LIBUSB_1_LIBRARIES - ${LIBUSB_1_LIBRARY} -) - - if (LIBUSB_1_INCLUDE_DIRS AND LIBUSB_1_LIBRARIES) - set(LIBUSB_1_FOUND TRUE) - endif (LIBUSB_1_INCLUDE_DIRS AND LIBUSB_1_LIBRARIES) - - if (LIBUSB_1_FOUND) - if (NOT libusb_1_FIND_QUIETLY) - message(STATUS "Found libusb-1.0:") -message(STATUS " - Includes: ${LIBUSB_1_INCLUDE_DIRS}") -message(STATUS " - Libraries: ${LIBUSB_1_LIBRARIES}") - endif (NOT libusb_1_FIND_QUIETLY) - else (LIBUSB_1_FOUND) - if (libusb_1_FIND_REQUIRED) - message(FATAL_ERROR "Could not find libusb") - endif (libusb_1_FIND_REQUIRED) - endif (LIBUSB_1_FOUND) - - # show the LIBUSB_1_INCLUDE_DIRS and LIBUSB_1_LIBRARIES variables only in the advanced view - mark_as_advanced(LIBUSB_1_INCLUDE_DIRS LIBUSB_1_LIBRARIES) - -endif (LIBUSB_1_LIBRARIES AND LIBUSB_1_INCLUDE_DIRS) diff --git a/DSLogic-gui/icons/checkbox.png b/DSLogic-gui/icons/checkbox.png deleted file mode 100644 index 8ca5395d..00000000 Binary files a/DSLogic-gui/icons/checkbox.png and /dev/null differ diff --git a/DSLogic-gui/icons/fullscreen.png b/DSLogic-gui/icons/fullscreen.png deleted file mode 100644 index 373ebfeb..00000000 Binary files a/DSLogic-gui/icons/fullscreen.png and /dev/null differ diff --git a/DSLogic-gui/icons/logo_muColor.png b/DSLogic-gui/icons/logo_muColor.png deleted file mode 100644 index 7b1d6a05..00000000 Binary files a/DSLogic-gui/icons/logo_muColor.png and /dev/null differ diff --git a/DSLogic-gui/icons/photo.png b/DSLogic-gui/icons/photo.png deleted file mode 100644 index 934f63e5..00000000 Binary files a/DSLogic-gui/icons/photo.png and /dev/null differ diff --git a/DSLogic-gui/icons/radiobutton.png b/DSLogic-gui/icons/radiobutton.png deleted file mode 100644 index 85fe1856..00000000 Binary files a/DSLogic-gui/icons/radiobutton.png and /dev/null differ diff --git a/DSLogic-gui/icons/set.png b/DSLogic-gui/icons/set.png deleted file mode 100644 index a076e229..00000000 Binary files a/DSLogic-gui/icons/set.png and /dev/null differ diff --git a/DSLogic-gui/icons/setting.png b/DSLogic-gui/icons/setting.png deleted file mode 100644 index 32a65bfb..00000000 Binary files a/DSLogic-gui/icons/setting.png and /dev/null differ diff --git a/DSLogic-gui/pv/decoder/decoder.cpp b/DSLogic-gui/pv/decoder/decoder.cpp deleted file mode 100644 index cf3f47b9..00000000 --- a/DSLogic-gui/pv/decoder/decoder.cpp +++ /dev/null @@ -1,55 +0,0 @@ -/* - * This file is part of the DSLogic-gui project. - * DSLogic-gui is based on PulseView. - * - * Copyright (C) 2012 Joel Holdsworth - * Copyright (C) 2013 DreamSourceLab - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - - -#include "decoder.h" - -namespace pv { -namespace decoder { - -Decoder::Decoder(boost::shared_ptr data, std::list sel_probes, QMap options_index) : - _data(data), - _sel_probes(sel_probes), - _options_index(options_index), - _total_state(0), - _max_state_samples(0) -{ -} - -std::list Decoder::get_probes() -{ - return _sel_probes; -} - -QMap Decoder::get_options_index() -{ - return _options_index; -} - -void Decoder::set_data(boost::shared_ptr _logic_data) -{ - assert(_logic_data); - _data = _logic_data; -} - -} // namespace decoder -} // namespace pv diff --git a/DSLogic-gui/pv/decoder/decoder.h b/DSLogic-gui/pv/decoder/decoder.h deleted file mode 100644 index fc2f82de..00000000 --- a/DSLogic-gui/pv/decoder/decoder.h +++ /dev/null @@ -1,115 +0,0 @@ -/* - * This file is part of the DSLogic-gui project. - * DSLogic-gui is based on PulseView. - * - * Copyright (C) 2012 Joel Holdsworth - * Copyright (C) 2013 DreamSourceLab - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - - -#ifndef DSLOGIC_PV_DECODER_H -#define DSLOGIC_PV_DECODER_H - -#include - -#include -#include -#include - -#include -#include - -namespace pv { - -namespace data { -class Logic; -} - -namespace decoder { - -enum { - DEC_CMD = 0, - DEC_DATA = 1, - DEC_CNT = 2, - DEC_NODETAIL -}; - -struct ds_view_state { - uint64_t index; - uint64_t samples; - uint16_t type; - uint8_t state; - uint8_t data; -}; - -enum { - I2C = 0, - SPI, - Serial, - Dmx512, - Wire1 -}; - -static QString protocol_list[] = { - "I2C", - "SPI", - "Serial", - "DMX512", - "1-Wire", - NULL, -}; - -class Decoder -{ -protected: - static const int _view_scale = 8; - Decoder(boost::shared_ptr data, std::list sel_probes, QMap options_index); -public: - std::list get_probes(); - QMap get_options_index(); - void set_data(boost::shared_ptr _logic_data); - -public: - virtual QString get_decode_name() = 0; - - virtual void recode(std::list sel_probes, QMap & options, QMap options_index) = 0; - virtual void decode() = 0; - - virtual void fill_color_table(std::vector & _color_table) = 0; - - virtual void fill_state_table(std::vector & _state_table) = 0; - - virtual void get_subsampled_states(std::vector &states, - uint64_t start, uint64_t end, - float min_length) = 0; - -private: - - -protected: - - boost::shared_ptr _data; - std::list _sel_probes; - QMap _options_index; - uint64_t _total_state; - uint64_t _max_state_samples; -}; - -} // namespace decoder -} // namespace pv - -#endif // DSLOGIC_PV_DECODER_H diff --git a/DSLogic-gui/pv/decoder/decoderfactory.cpp b/DSLogic-gui/pv/decoder/decoderfactory.cpp deleted file mode 100644 index 9cb13cc9..00000000 --- a/DSLogic-gui/pv/decoder/decoderfactory.cpp +++ /dev/null @@ -1,67 +0,0 @@ -/* - * This file is part of the DSLogic-gui project. - * DSLogic-gui is based on PulseView. - * - * Copyright (C) 2012 Joel Holdsworth - * Copyright (C) 2013 DreamSourceLab - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "decoderfactory.h" -#include "dsi2c.h" -#include "dsspi.h" -#include "dsserial.h" -#include "dsdmx512.h" -#include "ds1wire.h" - -namespace pv { -namespace decoder { - -DecoderFactory::DecoderFactory() -{ -} - -Decoder* DecoderFactory::createDecoder(int type, boost::shared_ptr data, - std::list _sel_probes, QMap &_options, QMap _options_index) -{ - Decoder *decoder = NULL; - - switch(type) - { - case I2C: - decoder = new dsI2c(data, _sel_probes, _options, _options_index); - break; - case SPI: - decoder = new dsSpi(data, _sel_probes, _options, _options_index); - break; - case Serial: - decoder = new dsSerial(data, _sel_probes, _options, _options_index); - break; - case Dmx512: - decoder = new dsDmx512(data, _sel_probes, _options, _options_index); - break; - case Wire1: - decoder = new ds1Wire(data, _sel_probes, _options, _options_index); - break; - default: - decoder = new dsI2c(data, _sel_probes, _options, _options_index); - } - - return decoder; -} - -} // namespace decoder -} // namespace pv diff --git a/DSLogic-gui/pv/decoder/decoderfactory.h b/DSLogic-gui/pv/decoder/decoderfactory.h deleted file mode 100644 index 435949d8..00000000 --- a/DSLogic-gui/pv/decoder/decoderfactory.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * This file is part of the DSLogic-gui project. - * DSLogic-gui is based on PulseView. - * - * Copyright (C) 2012 Joel Holdsworth - * Copyright (C) 2013 DreamSourceLab - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - - -#ifndef DSLOGIC_PV_DECODERFACTORY_H -#define DSLOGIC_PV_DECODERFACTORY_H - -#include "decoder.h" - -#include -#include - -namespace pv { -namespace decoder { - -class DecoderFactory -{ -public: - DecoderFactory(); - -public: - Decoder * createDecoder(int type, boost::shared_ptr data, - std::list _sel_probes, QMap &_options, QMap _options_index); - -}; - -} // namespace decoder -} // namespace pv - -#endif // DSLOGIC_PV_DECODERFACTORY_H diff --git a/DSLogic-gui/pv/decoder/democonfig.cpp b/DSLogic-gui/pv/decoder/democonfig.cpp deleted file mode 100644 index 0a91fe5d..00000000 --- a/DSLogic-gui/pv/decoder/democonfig.cpp +++ /dev/null @@ -1,260 +0,0 @@ -/* - * This file is part of the DSLogic-gui project. - * DSLogic-gui is based on PulseView. - * - * Copyright (C) 2012 Joel Holdsworth - * Copyright (C) 2013 DreamSourceLab - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - - -#include "democonfig.h" -#include "ui_i2cconfig.h" -#include "ui_spiconfig.h" -#include "ui_serialconfig.h" -#include "ui_dmx512config.h" -#include "ui_wire1config.h" - -#include "decoder.h" -#include "../sigsession.h" -#include "../view/signal.h" -#include "../view/logicsignal.h" - -#include - -namespace pv { -namespace decoder { - -DemoConfig::DemoConfig(QWidget *parent, struct sr_dev_inst *sdi, int protocol) : - QDialog(parent), - _sdi(sdi), - _protocol(protocol) -{ - assert(_sdi); - - i2c_ui = NULL; - spi_ui = NULL; - wire1_ui = NULL; - serial_ui = NULL; - dmx512_ui = NULL; - - if (_protocol == I2C) { - i2c_ui = new Ui::I2cConfig; - i2c_ui->setupUi(this); - - i2c_ui->setupUi(this); - for (const GSList *l = _sdi->probes; l; l = l->next) { - sr_probe *const probe = (sr_probe*)l->data; - assert(probe); - i2c_ui->scl_comboBox->addItem(QString::number(probe->index) + " - " + probe->name); - i2c_ui->sda_comboBox->addItem(QString::number(probe->index) + " - " + probe->name); - } - i2c_ui->scl_comboBox->setCurrentIndex(0); - i2c_ui->sda_comboBox->setCurrentIndex(1); - } else if (_protocol == SPI) { - spi_ui = new Ui::SpiConfig; - spi_ui->setupUi(this); - - spi_ui->setupUi(this); - for (const GSList *l = _sdi->probes; l; l = l->next) { - sr_probe *const probe = (sr_probe*)l->data; - assert(probe); - spi_ui->ssn_comboBox->addItem(QString::number(probe->index) + " - " + probe->name); - spi_ui->sclk_comboBox->addItem(QString::number(probe->index) + " - " + probe->name); - spi_ui->mosi_comboBox->addItem(QString::number(probe->index) + " - " + probe->name); - spi_ui->miso_comboBox->addItem(QString::number(probe->index) + " - " + probe->name); - } - spi_ui->ssn_comboBox->setCurrentIndex(0); - spi_ui->sclk_comboBox->setCurrentIndex(1); - spi_ui->mosi_comboBox->setCurrentIndex(2); - spi_ui->miso_comboBox->setCurrentIndex(3); - } else if (_protocol == Serial) { - serial_ui = new Ui::SerialConfig; - serial_ui->setupUi(this); - - serial_ui->setupUi(this); - for (const GSList *l = _sdi->probes; l; l = l->next) { - sr_probe *const probe = (sr_probe*)l->data; - assert(probe); - serial_ui->serial_comboBox->addItem(QString::number(probe->index) + " - " + probe->name); - } - serial_ui->serial_comboBox->setCurrentIndex(0); - } else if (_protocol == Dmx512) { - dmx512_ui = new Ui::Dmx512Config; - dmx512_ui->setupUi(this); - - dmx512_ui->setupUi(this); - for (const GSList *l = _sdi->probes; l; l = l->next) { - sr_probe *const probe = (sr_probe*)l->data; - assert(probe); - dmx512_ui->probe_comboBox->addItem(QString::number(probe->index) + " - " + probe->name); - } - dmx512_ui->probe_comboBox->setCurrentIndex(0); - } else if (_protocol == Wire1) { - wire1_ui = new Ui::Wire1Config; - wire1_ui->setupUi(this); - - wire1_ui->setupUi(this); - for (const GSList *l = _sdi->probes; l; l = l->next) { - sr_probe *const probe = (sr_probe*)l->data; - assert(probe); - wire1_ui->probe_comboBox->addItem(QString::number(probe->index) + " - " + probe->name); - } - wire1_ui->probe_comboBox->setCurrentIndex(0); - } - -} - -DemoConfig::~DemoConfig() -{ - if (i2c_ui) - delete i2c_ui; - if (spi_ui) - delete spi_ui; - if (serial_ui) - delete serial_ui; - if (dmx512_ui) - delete dmx512_ui; - if (wire1_ui) - delete wire1_ui; -} - -void DemoConfig::accept() -{ - using namespace Qt; - - QDialog::accept(); - - if (_protocol == I2C) { - if (!_sel_probes.empty()) - _sel_probes.clear(); - _sel_probes.push_back(i2c_ui->scl_comboBox->currentIndex()); - _sel_probes.push_back(i2c_ui->sda_comboBox->currentIndex()); - } else if (_protocol == SPI) { - const int ssn_option = spi_ui->cs_comboBox->currentText().contains("low", Qt::CaseInsensitive) ? 0 : - spi_ui->cs_comboBox->currentText().contains("high", Qt::CaseInsensitive) ? 1 : -1; - if (!_sel_probes.empty()) - _sel_probes.clear(); - if (ssn_option != -1) - _sel_probes.push_back(spi_ui->ssn_comboBox->currentIndex()); - _sel_probes.push_back(spi_ui->sclk_comboBox->currentIndex()); - _sel_probes.push_back(spi_ui->mosi_comboBox->currentIndex()); - _sel_probes.push_back(spi_ui->miso_comboBox->currentIndex()); - - if (!_options.empty()) - _options.clear(); - _options.insert("cpol", spi_ui->cpol_comboBox->currentText().contains("0", Qt::CaseInsensitive) ? 0 : 1); - _options.insert("cpha", spi_ui->cpha_comboBox->currentText().contains("0", Qt::CaseInsensitive) ? 0 : 1); - _options.insert("bits", spi_ui->bits_comboBox->currentText().toUInt()); - _options.insert("order", spi_ui->order_comboBox->currentText().contains("MSB", Qt::CaseInsensitive) ? 1 : 0); - _options.insert("ssn", ssn_option); - - if (!_options_index.empty()) - _options_index.clear(); - _options_index.insert("cpol", spi_ui->cpol_comboBox->currentIndex()); - _options_index.insert("cpha", spi_ui->cpha_comboBox->currentIndex()); - _options_index.insert("bits", spi_ui->bits_comboBox->currentIndex()); - _options_index.insert("order", spi_ui->order_comboBox->currentIndex()); - _options_index.insert("ssn", spi_ui->ssn_comboBox->currentIndex()); - } else if (_protocol == Serial) { - if (!_sel_probes.empty()) - _sel_probes.clear(); - _sel_probes.push_back(serial_ui->serial_comboBox->currentIndex()); - - if (!_options.empty()) - _options.clear(); - _options.insert("baudrate", (serial_ui->baud_checkBox->checkState() == Qt::Checked) ? 0 : serial_ui->baud_comboBox->currentText().toULongLong()); - _options.insert("stopbits", serial_ui->stopbits_comboBox->currentText().toFloat()); - _options.insert("parity", serial_ui->parity_comboBox->currentText().contains("even", Qt::CaseInsensitive) ? 0 : - serial_ui->parity_comboBox->currentText().contains("odd", Qt::CaseInsensitive) ? 1 : -1); - _options.insert("order", serial_ui->order_comboBox->currentText().contains("LSB", Qt::CaseInsensitive) ? 1 : 0); - _options.insert("bits", serial_ui->bits_comboBox->currentText().toUInt()); - _options.insert("idle", serial_ui->idle_comboBox->currentText().contains("Low", Qt::CaseInsensitive) ? 0 : 1); - - if (!_options_index.empty()) - _options_index.clear(); - _options_index.insert("baudrate", (serial_ui->baud_checkBox->checkState() == Qt::Checked) ? -1 : serial_ui->baud_comboBox->currentIndex()); - _options_index.insert("stopbits", serial_ui->stopbits_comboBox->currentIndex()); - _options_index.insert("parity", serial_ui->parity_comboBox->currentIndex()); - _options_index.insert("order", serial_ui->order_comboBox->currentIndex()); - _options_index.insert("bits", serial_ui->bits_comboBox->currentIndex()); - _options_index.insert("idle", serial_ui->idle_comboBox->currentIndex()); - } else if (_protocol == Dmx512) { - if (!_sel_probes.empty()) - _sel_probes.clear(); - _sel_probes.push_back(dmx512_ui->probe_comboBox->currentIndex()); - } else if (_protocol == Wire1) { - if (!_sel_probes.empty()) - _sel_probes.clear(); - _sel_probes.push_back(wire1_ui->probe_comboBox->currentIndex()); - } - -} - -void DemoConfig::set_config(std::list sel_probes, QMap options_index) -{ - if (_protocol == I2C) { - i2c_ui->scl_comboBox->setCurrentIndex(sel_probes.front()); - i2c_ui->sda_comboBox->setCurrentIndex(sel_probes.back()); - } else if (_protocol == SPI) { - spi_ui->ssn_comboBox->setCurrentIndex(sel_probes.front());sel_probes.pop_front(); - spi_ui->sclk_comboBox->setCurrentIndex(sel_probes.front());sel_probes.pop_front(); - spi_ui->mosi_comboBox->setCurrentIndex(sel_probes.front());sel_probes.pop_front(); - spi_ui->miso_comboBox->setCurrentIndex(sel_probes.front());sel_probes.pop_front(); - - spi_ui->cpol_comboBox->setCurrentIndex(options_index.value("cpol")); - spi_ui->cpha_comboBox->setCurrentIndex(options_index.value("cpha")); - spi_ui->bits_comboBox->setCurrentIndex(options_index.value("bits")); - spi_ui->order_comboBox->setCurrentIndex(options_index.value("order")); - spi_ui->ssn_comboBox->setCurrentIndex(options_index.value("ssn")); - - } else if (_protocol == Serial) { - serial_ui->serial_comboBox->setCurrentIndex(sel_probes.front()); - - if (options_index.value("baudrate") == -1) - serial_ui->baud_checkBox->setChecked(true); - else - serial_ui->baud_comboBox->setCurrentIndex(options_index.value("baudrate")); - serial_ui->stopbits_comboBox->setCurrentIndex(options_index.value("stopbits")); - serial_ui->parity_comboBox->setCurrentIndex(options_index.value("parity")); - serial_ui->order_comboBox->setCurrentIndex(options_index.value("order")); - serial_ui->bits_comboBox->setCurrentIndex(options_index.value("bits")); - serial_ui->idle_comboBox->setCurrentIndex(options_index.value("idle")); - } else if (_protocol == Dmx512) { - dmx512_ui->probe_comboBox->setCurrentIndex(sel_probes.front()); - } else if (_protocol == Wire1) { - wire1_ui->probe_comboBox->setCurrentIndex(sel_probes.front()); - } - -} - -std::list DemoConfig::get_sel_probes() -{ - return _sel_probes; -} - -QMap &DemoConfig::get_options() -{ - return _options; -} - -QMap DemoConfig::get_options_index() -{ - return _options_index; -} - -} // namespace decoder -} // namespace pv diff --git a/DSLogic-gui/pv/decoder/democonfig.h b/DSLogic-gui/pv/decoder/democonfig.h deleted file mode 100644 index d4892091..00000000 --- a/DSLogic-gui/pv/decoder/democonfig.h +++ /dev/null @@ -1,91 +0,0 @@ -/* - * This file is part of the DSLogic-gui project. - * DSLogic-gui is based on PulseView. - * - * Copyright (C) 2012 Joel Holdsworth - * Copyright (C) 2013 DreamSourceLab - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - - -#ifndef DSLOGIC_PV_DEMOCONFIG_H -#define DSLOGIC_PV_DEMOCONFIG_H - -#include -#include -#include - -#include "../sigsession.h" - -#include - -#include - -namespace Ui { -class I2cConfig; -class SpiConfig; -class SerialConfig; -class Dmx512Config; -class Wire1Config; -} - -namespace pv { -namespace decoder { - -class DemoConfig : public QDialog -{ - Q_OBJECT - -public: - - DemoConfig(QWidget *parent = 0, sr_dev_inst *sdi = 0, int protocol = 0); - virtual ~DemoConfig(); - - void set_config(std::list sel_probes, QMap options_index); - - std::list get_sel_probes(); - - QMap & get_options(); - - QMap get_options_index(); - -protected: - void accept(); - -signals: - -public slots: - -private: - sr_dev_inst *_sdi; - - int _protocol; - - std::list _sel_probes; - QMap _options; - QMap _options_index; - - Ui::I2cConfig *i2c_ui; - Ui::SpiConfig *spi_ui; - Ui::SerialConfig *serial_ui; - Ui::Dmx512Config *dmx512_ui; - Ui::Wire1Config *wire1_ui; -}; - -} // namespace decoder -} // namespace pv - -#endif // DSLOGIC_PV_DEMOCONFIG_H diff --git a/DSLogic-gui/pv/decoder/dmx512config.ui b/DSLogic-gui/pv/decoder/dmx512config.ui deleted file mode 100644 index bc7b902f..00000000 --- a/DSLogic-gui/pv/decoder/dmx512config.ui +++ /dev/null @@ -1,103 +0,0 @@ - - - Dmx512Config - - - - 0 - 0 - 360 - 150 - - - - - 360 - 150 - - - - - 360 - 150 - - - - Dialog - - - - - 10 - 100 - 341 - 32 - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - 130 - 40 - 141 - 20 - - - - - - - 21 - 40 - 84 - 16 - - - - Data Signal - - - - - - - buttonBox - accepted() - Dmx512Config - accept() - - - 248 - 254 - - - 157 - 274 - - - - - buttonBox - rejected() - Dmx512Config - reject() - - - 316 - 260 - - - 286 - 274 - - - - - diff --git a/DSLogic-gui/pv/decoder/ds1wire.cpp b/DSLogic-gui/pv/decoder/ds1wire.cpp deleted file mode 100644 index 04d3ec38..00000000 --- a/DSLogic-gui/pv/decoder/ds1wire.cpp +++ /dev/null @@ -1,455 +0,0 @@ -/* - * This file is part of the DSLogic-gui project. - * DSLogic-gui is based on PulseView. - * - * Copyright (C) 2012 Joel Holdsworth - * Copyright (C) 2013 DreamSourceLab - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - - -#include "ds1wire.h" - -#include - -using namespace boost; -using namespace std; - -namespace pv { -namespace decoder { - -const QColor ds1Wire::ColorTable[TableSize] = { - QColor(255, 255, 255, 150), - QColor(0, 255, 0, 150), - QColor(255, 0, 0, 150), - QColor(0, 255, 0, 150), - QColor(255, 0, 0, 150), - QColor(0, 0, 255, 150), - QColor(0, 0, 255, 150), - QColor(0, 255, 255, 150), -}; - -const QString ds1Wire::StateTable[TableSize] = { - "UNKNOWN", - "RESET", - "PRESENCE", - "COMMAND", - "FAMILY CODE", - "SERIAL NUMBER", - "CRC", - "DATA" -}; - -ds1Wire::ds1Wire(boost::shared_ptr data, std::list _sel_probes, QMap &_options, QMap _options_index) : - Decoder(data, _sel_probes, _options_index) -{ - (void)_options; - - assert(_sel_probes.size() == 1); - - _wire_index = _sel_probes.front(); -} - -ds1Wire::~ds1Wire() -{ -} - -QString ds1Wire::get_decode_name() -{ - return "1-Wire"; -} - -void ds1Wire::recode(std::list _sel_probes, QMap & _options, QMap _options_index) -{ - (void)_options; - - assert(_sel_probes.size() == 1); - _wire_index = _sel_probes.front(); - - this->_sel_probes = _sel_probes; - this->_options_index = _options_index; - - decode(); -} - -void ds1Wire::decode() -{ - assert(_data); - _max_width = 0; - uint8_t cur_state = Unknown; - - const deque< boost::shared_ptr > &snapshots = - _data->get_snapshots(); - if (snapshots.empty()) - return; - - const boost::shared_ptr &snapshot = - snapshots.front(); - - uint64_t flag_index1; - uint64_t flag_index2; - uint64_t flag_index3; - uint64_t flag_index4; - //uint64_t start_index; - //uint64_t stop_index; - //bool edge1; - //bool edge2; - uint64_t left = 0; - uint64_t right = snapshot->get_sample_count() - 1; - const uint64_t samplerate = _data->get_samplerate(); - double pulse_width1; - double pulse_width2; - double pulse_width3; - double pulse_width4; - - uint8_t data; - bool valid = false; - - if (!_state_index.empty()) - _state_index.clear(); - - while(left < right && pulse_width1 != 0) // Regular Speed - { - // search reset flag - pulse_width1 = get_next_pulse_width(0, samplerate, left, right, snapshot); - flag_index1 = left; - if (pulse_width1 >= 0.48 && pulse_width1 <= 0.96) { // tRSTL - pulse_width2 = get_next_pulse_width(1, samplerate, left, right, snapshot); - flag_index2 = left; - if (pulse_width2 >= 0.015 && pulse_width2 <= 0.06) { // tPDH - pulse_width3 = get_next_pulse_width(0, samplerate, left, right, snapshot); - flag_index3 = left; - if (pulse_width3 >= 0.06 && pulse_width3 <= 0.24) { // tPDL - pulse_width4 = get_next_pulse_width(1, samplerate, left, right, snapshot); - flag_index4 = left; - if (pulse_width2 + pulse_width3 + pulse_width4 >= 0.48) { - cur_state = Reset; - _state_index.push_back(std::make_pair(std::make_pair(flag_index1, flag_index2 - flag_index1), std::make_pair(cur_state, 0))); - cur_state = Presence; - _state_index.push_back(std::make_pair(std::make_pair(flag_index3, flag_index4 - flag_index3), std::make_pair(cur_state, 0))); - } else { - continue; - } - } else { - continue; - } - } else { - continue; - } - } else { - continue; - } - - uint64_t start; - uint64_t end; - int i; - if (cur_state == Presence) { - data = get_next_data(false, valid, start, end, samplerate, left, right, snapshot); - if (valid) { - cur_state = Command; - _state_index.push_back(std::make_pair(std::make_pair(start, end - start), std::make_pair(cur_state, data))); - }else { - continue; - } - } - - if (cur_state == Command) { - data = get_next_data(false, valid, start, end, samplerate, left, right, snapshot); - if (valid) { - cur_state = Family; - _state_index.push_back(std::make_pair(std::make_pair(start, end - start), std::make_pair(cur_state, data))); - } else { - continue; - } - } - - if (cur_state == Family) { - for (i = 0; i < 6; i++) { - data = get_next_data(false, valid, start, end, samplerate, left, right, snapshot); - if (valid) { - cur_state = Serial; - _state_index.push_back(std::make_pair(std::make_pair(start, end - start), std::make_pair(cur_state, data))); - } else { - break; - } - } - if (i != 6) - continue; - } - - if (cur_state == Serial) { - data = get_next_data(false, valid, start, end, samplerate, left, right, snapshot); - if (valid) { - cur_state = Crc; - _state_index.push_back(std::make_pair(std::make_pair(start, end - start), std::make_pair(cur_state, data))); - } else { - continue; - } - } - - if (cur_state == Crc) { - while (1) { - data = get_next_data(false, valid, start, end, samplerate, left, right, snapshot); - if (valid) { - cur_state = Data; - _state_index.push_back(std::make_pair(std::make_pair(start, end - start), std::make_pair(cur_state, data))); - } else { - break; - } - } - } - } - -// if (cur_state == Unknown) { -// while(1) { // Overdrive Speed - -// } -// } -} - -double ds1Wire::get_next_pulse_width(bool level, uint64_t samplerate, uint64_t &left, uint64_t right, - const boost::shared_ptr &snapshot) -{ - double pulse_width = 0; - uint64_t flag_index1; - uint64_t flag_index2; - bool edge1; - bool edge2; - - if (snapshot->get_first_edge(flag_index1, edge1, left, right, _wire_index, level, _wire_index, -1) == SR_OK) { - left = flag_index1; - if (snapshot->get_first_edge(flag_index2, edge2, left, right, _wire_index, !level, _wire_index, -1) == SR_OK) { - pulse_width = (flag_index2 - flag_index1) * 1000.0f / samplerate; - } - } - - return pulse_width; -} - -uint8_t ds1Wire::get_next_data(bool speed, bool &valid, uint64_t &start, uint64_t &end, - uint64_t samplerate, uint64_t &left, uint64_t right, - const boost::shared_ptr &snapshot) -{ - uint8_t data = 0; - double pulse_width1; - uint64_t org_left = left; - int i; - - valid = true; - if (speed == false) { - for (i = 0; i < 8; i++) { - pulse_width1 = get_next_pulse_width(0, samplerate, left, right, snapshot); - start = (i == 0) ? left : start; - end = (i == 7) ? left + samplerate * 0.001 * 0.06 : end; - if (pulse_width1 >= 0.001 && pulse_width1 < 0.015) { - pulse_width1 = get_next_pulse_width(1, samplerate, left, right, snapshot); - if (pulse_width1 >= 0.046) { - data = data + (1 << i); - org_left = left; - } else { - left = org_left; - valid = false; - break; - } - } else if (pulse_width1 >= 0.06 && pulse_width1 < 0.12) { - pulse_width1 = get_next_pulse_width(1, samplerate, left, right, snapshot); - if (pulse_width1 >= 0.001) { - org_left = left; - //data = data << 1; - } else { - left = org_left; - valid = false; - break; - } - } else { - left = org_left; - valid = false; - break; - } - } - } else { - for (i = 0; i < 8; i++) { - pulse_width1 = get_next_pulse_width(0, samplerate, left, right, snapshot); - start = (i == 0) ? left : start; - end = (i == 7) ? left + samplerate * 0.001 * 0.006 : end; - if (pulse_width1 >= 0.001 && pulse_width1 < 0.002) { - pulse_width1 = get_next_pulse_width(1, samplerate, left, right, snapshot); - if (pulse_width1 >= 0.006) { - org_left = left; - data = data + (1 << i); - } else { - left = org_left; - valid = false; - break; - } - } else if (pulse_width1 >= 0.006 && pulse_width1 < 0.016) { - pulse_width1 = get_next_pulse_width(1, samplerate, left, right, snapshot); - if (pulse_width1 >= 0.001) { - org_left = left; - //data = data << 1; - } else { - left = org_left; - valid = false; - break; - } - } else { - left = org_left; - valid = false; - break; - } - } - } - - return data; -} - -void ds1Wire::fill_color_table(std::vector & _color_table) -{ - int i; - for(i = 0; i < TableSize; i++) - _color_table.push_back(ColorTable[i]); -} - -void ds1Wire::fill_state_table(std::vector & _state_table) -{ - int i; - for(i = 0; i < TableSize; i++) - _state_table.push_back(StateTable[i]); -} - -void ds1Wire::get_subsampled_states(std::vector &states, - uint64_t start, uint64_t end, - float min_length) -{ - ds_view_state view_state; - - const deque< boost::shared_ptr > &snapshots = - _data->get_snapshots(); - if (snapshots.empty()) - return; - const boost::shared_ptr &snapshot = - snapshots.front(); - - assert(end <= snapshot->get_sample_count()); - assert(start <= end); - assert(min_length > 0); - - if (!states.empty()) - states.clear(); - - if (_state_index.empty()) - return; - if (start > _state_index.at(_state_index.size() - 1).first.first) - return; - if (end < _state_index.at(0).first.first) - return; - - if (min_length * _view_scale > _max_width) { - view_state.index = _state_index.at(0).first.first; - view_state.samples = _state_index.at(_state_index.size() - 1).first.first + - _state_index.at(_state_index.size() - 1).first.second - _state_index.at(0).first.first; - view_state.type = DEC_NODETAIL; - view_state.state = 0; - view_state.data = 0; - states.push_back(view_state); - return; - } - - uint64_t view_start = 0; - uint64_t view_end = 0; - uint64_t minIndex = 0; - uint64_t maxIndex = _state_index.size() - 1; - uint64_t i = start * 1.0f / snapshot->get_sample_count() * maxIndex; - bool check_flag = false; - int times = 0; - while(times <= 32) { - if (_state_index.at(i).first.first + _state_index.at(i).first.second >= start) { - check_flag = true; - } else { - minIndex = i; - i = ceil((i + maxIndex) / 2.0f); - } - - if (check_flag) { - if (i == 0) { - view_start = i; - break; - } else if (_state_index.at(i-1).first.first + _state_index.at(i-1).first.second < start) { - view_start = i; - break; - } else { - maxIndex = i; - i = (i + minIndex) / 2; - } - check_flag = false; - } - times++; - } - i = view_start; - check_flag = false; - times = 0; - minIndex = view_start; - //maxIndex = _state_index.size() - 1; - maxIndex = min(_state_index.size() - 1, (size_t)end); - view_end = view_start; - while(times <= 32) { - if (_state_index.at(i).first.first <= end) { - check_flag = true; - } else { - maxIndex = i; - i = (i + minIndex) / 2; - } - - if (check_flag) { - if (i == maxIndex) { - view_end = i; - break; - } else if (_state_index.at(i+1).first.first > end) { - view_end = i; - break; - } else { - minIndex = i; - i = ceil((i + maxIndex) / 2.0f); - } - check_flag = false; - } - times++; - } - - assert(view_end >= view_start); - - for (uint64_t i = view_start; i <= view_end; i++) { - if (_state_index.at(i).first.second >= min_length * _view_scale) { - view_state.index = _state_index.at(i).first.first; - view_state.samples = _state_index.at(i).first.second; - view_state.type = (_state_index.at(i).second.first == Reset || - _state_index.at(i).second.first == Presence) ? DEC_CMD : DEC_DATA; - view_state.state = _state_index.at(i).second.first; - view_state.data = _state_index.at(i).second.second; - states.push_back(view_state); - } else { - view_state.index = _state_index.at(i).first.first; - view_state.samples = _state_index.at(i).first.second; - view_state.type = DEC_NODETAIL; - view_state.state = 0; - view_state.data = 0; - states.push_back(view_state); - } - } -} - -} // namespace decoder -} // namespace pv diff --git a/DSLogic-gui/pv/decoder/ds1wire.h b/DSLogic-gui/pv/decoder/ds1wire.h deleted file mode 100644 index 56706fbd..00000000 --- a/DSLogic-gui/pv/decoder/ds1wire.h +++ /dev/null @@ -1,91 +0,0 @@ -/* - * This file is part of the DSLogic-gui project. - * DSLogic-gui is based on PulseView. - * - * Copyright (C) 2012 Joel Holdsworth - * Copyright (C) 2013 DreamSourceLab - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - - -#ifndef DSLOGIC_PV_DS1WIRE_H -#define DSLOGIC_PV_DS1WIRE_H - -#include "decoder.h" -#include "../data/logic.h" -#include "../data/logicsnapshot.h" - -#include - -namespace pv { - -namespace data { -class LogicSnapshot; -} - -namespace decoder { - -class ds1Wire : public Decoder -{ -private: - static const int TableSize = 8; - static const QColor ColorTable[TableSize]; - static const QString StateTable[TableSize]; - - enum {Unknown = 0, Reset, Presence, Command, Family, Serial, Crc, Data}; - -private: - - double get_next_pulse_width(bool level, - uint64_t samplerate, uint64_t &left, uint64_t right, - const boost::shared_ptr &snapshot); - - uint8_t get_next_data(bool speed, bool &valid, uint64_t &start, uint64_t &end, - uint64_t samplerate, uint64_t &left, uint64_t right, - const boost::shared_ptr &snapshot); - -public: - ds1Wire(boost::shared_ptr data, - std::list _sel_probes, QMap &_options, QMap _options_index); - - virtual ~ds1Wire(); - - QString get_decode_name(); - - void recode(std::list _sel_probes, QMap & _options, QMap _options_index); - - void decode(); - - void fill_color_table(std::vector & _color_table); - - void fill_state_table(std::vector & _state_table); - - void get_subsampled_states(std::vector &states, - uint64_t start, uint64_t end, - float min_length); - -private: - - int _wire_index; - uint64_t _max_width; - std::vector< pv::data::LogicSnapshot::EdgePair > _cur_edges; - std::vector< std::pair, std::pair > > _state_index; -}; - -} // namespace decoder -} // namespace pv - -#endif // DSLOGIC_PV_DS1WIRE_H diff --git a/DSLogic-gui/pv/decoder/dsdmx512.cpp b/DSLogic-gui/pv/decoder/dsdmx512.cpp deleted file mode 100644 index 846f2833..00000000 --- a/DSLogic-gui/pv/decoder/dsdmx512.cpp +++ /dev/null @@ -1,380 +0,0 @@ -/* - * This file is part of the DSLogic-gui project. - * DSLogic-gui is based on PulseView. - * - * Copyright (C) 2012 Joel Holdsworth - * Copyright (C) 2013 DreamSourceLab - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - - -#include "dsdmx512.h" - -#include - -using namespace boost; -using namespace std; - -namespace pv { -namespace decoder { - -const QColor dsDmx512::ColorTable[TableSize] = { - QColor(255, 255, 255, 150), - QColor(0, 255, 0, 150), - QColor(255, 0, 0, 150), - QColor(0, 255, 0, 150), - QColor(255, 0, 0, 150), - QColor(0, 0, 255, 150), - QColor(0, 0, 255, 150), - QColor(0, 255, 255, 150), -}; - -const QString dsDmx512::StateTable[TableSize] = { - "UNKNOWN", - "BREAK", - "MAB", - "START", - "START CODE", - "STOP", - "MARK", - "SLOT" -}; - -dsDmx512::dsDmx512(boost::shared_ptr data, std::list _sel_probes, QMap &_options, QMap _options_index) : - Decoder(data, _sel_probes, _options_index) -{ - (void)_options; - - assert(_sel_probes.size() == 1); - - _dmx_index = _sel_probes.front(); -} - -dsDmx512::~dsDmx512() -{ -} - -QString dsDmx512::get_decode_name() -{ - return "DMX512"; -} - -void dsDmx512::recode(std::list _sel_probes, QMap & _options, QMap _options_index) -{ - (void)_options; - - assert(_sel_probes.size() == 1); - _dmx_index = _sel_probes.front(); - - this->_sel_probes = _sel_probes; - this->_options_index = _options_index; - - decode(); -} - -void dsDmx512::decode() -{ - assert(_data); - _max_width = 0; - uint8_t cur_state = Unknown; - - const deque< boost::shared_ptr > &snapshots = - _data->get_snapshots(); - if (snapshots.empty()) - return; - - const boost::shared_ptr &snapshot = - snapshots.front(); - - //uint64_t flag_index; - uint64_t start_index; - uint64_t stop_index; - //bool edge; - uint64_t left = 0; - uint64_t right = snapshot->get_sample_count() - 1; - const uint64_t samplerate = _data->get_samplerate(); - double pulse_width; - bool valid; - - if (!_state_index.empty()) - _state_index.clear(); - - while(1) - { - // search Break flag - - pulse_width = get_next_pulse_width(0, samplerate, left, right, stop_index, snapshot); - start_index = left; - if (pulse_width >= 0.088 && pulse_width <= 1000) { // Break - cur_state = Break; - _state_index.push_back(std::make_pair(std::make_pair(start_index, stop_index - start_index), std::make_pair(cur_state, 0))); - _max_width = max(_max_width, stop_index - start_index); - } else if (pulse_width == 0){ - break; - } else { - continue; - } - - if (cur_state == Break) { - pulse_width = get_next_pulse_width(1, samplerate, left, right, stop_index, snapshot); - start_index = left; - if (pulse_width >= 0.012 && pulse_width <= 1000) { // Marker After Break - cur_state = Mab; - _state_index.push_back(std::make_pair(std::make_pair(start_index, stop_index - start_index), std::make_pair(cur_state, 0))); - _max_width = max(_max_width, stop_index - start_index); - } else { - continue; - } - } - - if (cur_state == Mab) { - get_next_data(true, valid, cur_state, samplerate, left, right, snapshot); - } - - while(valid) - get_next_data(false, valid, cur_state, samplerate, left, right, snapshot); - } - -} - -double dsDmx512::get_next_pulse_width(bool level, uint64_t samplerate, uint64_t &left, uint64_t right, uint64_t &end, - const boost::shared_ptr &snapshot) -{ - double pulse_width = 0; - uint64_t flag_index1; - uint64_t flag_index2; - bool edge1; - bool edge2; - - if (snapshot->get_first_edge(flag_index1, edge1, left, right, _dmx_index, level, _dmx_index, -1) == SR_OK) { - left = flag_index1; - if (snapshot->get_first_edge(flag_index2, edge2, left, right, _dmx_index, !level, _dmx_index, -1) == SR_OK) { - end = flag_index2; - pulse_width = (flag_index2 - flag_index1) * 1000.0f / samplerate; - } - } - - return pulse_width; -} - -uint8_t dsDmx512::get_next_data(bool code, bool &valid, uint8_t &cur_state, - uint64_t samplerate, uint64_t &left, uint64_t right, - const boost::shared_ptr &snapshot) -{ - uint8_t data = 0; - double pulse_width; - uint64_t org_left = left; - //int i; - uint64_t samplesPerBit = ceil(samplerate * 0.001 * 0.004); - const uint64_t dmx_mask = 1ULL << _dmx_index; - bool edge; - uint64_t start = left; - uint64_t end = left; - const uint8_t *src_ptr; - const int unit_size = snapshot->get_unit_size(); - - valid = false; - pulse_width = get_next_pulse_width(0, samplerate, left, right, end, snapshot); - if (pulse_width >= 0.00392 && pulse_width <= 0.00408 * 9) { // Start bit - org_left = left; - start = left; - end = start + samplesPerBit; - cur_state = Start; - _state_index.push_back(std::make_pair(std::make_pair(start, end - start), std::make_pair(cur_state, 0))); - _max_width = max(_max_width, end - start); - } else { - left = org_left; - return data; - } - - if (cur_state == Start) { - src_ptr = (uint8_t*)snapshot->get_data(); - start = end; - data = data + (((*(uint64_t*)(src_ptr + (int)(start + samplesPerBit * 0.5) * unit_size) & dmx_mask) != 0) << 0); - data = data + (((*(uint64_t*)(src_ptr + (int)(start + samplesPerBit * 1.5) * unit_size) & dmx_mask) != 0) << 1); - data = data + (((*(uint64_t*)(src_ptr + (int)(start + samplesPerBit * 2.5) * unit_size) & dmx_mask) != 0) << 2); - data = data + (((*(uint64_t*)(src_ptr + (int)(start + samplesPerBit * 3.5) * unit_size) & dmx_mask) != 0) << 3); - data = data + (((*(uint64_t*)(src_ptr + (int)(start + samplesPerBit * 4.5) * unit_size) & dmx_mask) != 0) << 4); - data = data + (((*(uint64_t*)(src_ptr + (int)(start + samplesPerBit * 5.5) * unit_size) & dmx_mask) != 0) << 5); - data = data + (((*(uint64_t*)(src_ptr + (int)(start + samplesPerBit * 6.5) * unit_size) & dmx_mask) != 0) << 6); - data = data + (((*(uint64_t*)(src_ptr + (int)(start + samplesPerBit * 7.5) * unit_size) & dmx_mask) != 0) << 7); - end = start + samplesPerBit * 8; - cur_state = code ? Scode : Slot; - _state_index.push_back(std::make_pair(std::make_pair(start, end - start), std::make_pair(cur_state, data))); - _max_width = max(_max_width, end - start); - } - - org_left = end; - left = start + samplesPerBit * 8.5; - if ((*(uint64_t*)(src_ptr + left * unit_size) & dmx_mask) != 0) { - if (snapshot->get_first_edge(end, edge, left, right, _dmx_index, 0, _dmx_index, -1) == SR_OK) { - pulse_width = (end - org_left) * 1000.0f / samplerate; - if (pulse_width >= 0.008 && pulse_width <= 1000) { - start = org_left; - end = start + samplesPerBit * 2; - cur_state = Stop; - _state_index.push_back(std::make_pair(std::make_pair(start, end - start), std::make_pair(cur_state, 0))); - _max_width = max(_max_width, end - start); - } - } else { - left = org_left; - return data; - } - } else { - return data; - } - - valid = true; - return data; -} - -void dsDmx512::fill_color_table(std::vector & _color_table) -{ - int i; - for(i = 0; i < TableSize; i++) - _color_table.push_back(ColorTable[i]); -} - -void dsDmx512::fill_state_table(std::vector & _state_table) -{ - int i; - for(i = 0; i < TableSize; i++) - _state_table.push_back(StateTable[i]); -} - -void dsDmx512::get_subsampled_states(std::vector &states, - uint64_t start, uint64_t end, - float min_length) -{ - ds_view_state view_state; - - const deque< boost::shared_ptr > &snapshots = - _data->get_snapshots(); - if (snapshots.empty()) - return; - const boost::shared_ptr &snapshot = - snapshots.front(); - - assert(end <= snapshot->get_sample_count()); - assert(start <= end); - assert(min_length > 0); - - if (!states.empty()) - states.clear(); - - if (_state_index.empty()) - return; - if (start > _state_index.at(_state_index.size() - 1).first.first) - return; - if (end < _state_index.at(0).first.first) - return; - - if (min_length * _view_scale > _max_width) { - view_state.index = _state_index.at(0).first.first; - view_state.samples = _state_index.at(_state_index.size() - 1).first.first + - _state_index.at(_state_index.size() - 1).first.second - _state_index.at(0).first.first; - view_state.type = DEC_NODETAIL; - view_state.state = 0; - view_state.data = 0; - states.push_back(view_state); - return; - } - - uint64_t view_start = 0; - uint64_t view_end = 0; - uint64_t minIndex = 0; - uint64_t maxIndex = _state_index.size() - 1; - uint64_t i = start * 1.0f / snapshot->get_sample_count() * maxIndex; - bool check_flag = false; - int times = 0; - while(times <= 32) { - if (_state_index.at(i).first.first + _state_index.at(i).first.second >= start) { - check_flag = true; - } else { - minIndex = i; - i = ceil((i + maxIndex) / 2.0f); - } - - if (check_flag) { - if (i == 0) { - view_start = i; - break; - } else if (_state_index.at(i-1).first.first + _state_index.at(i-1).first.second < start) { - view_start = i; - break; - } else { - maxIndex = i; - i = (i + minIndex) / 2; - } - check_flag = false; - } - times++; - } - i = view_start; - check_flag = false; - times = 0; - minIndex = view_start; - //maxIndex = _state_index.size() - 1; - maxIndex = min(_state_index.size() - 1, (size_t)end); - view_end = view_start; - while(times <= 32) { - if (_state_index.at(i).first.first <= end) { - check_flag = true; - } else { - maxIndex = i; - i = (i + minIndex) / 2; - } - - if (check_flag) { - if (i == maxIndex) { - view_end = i; - break; - } else if (_state_index.at(i+1).first.first > end) { - view_end = i; - break; - } else { - minIndex = i; - i = ceil((i + maxIndex) / 2.0f); - } - check_flag = false; - } - times++; - } - - assert(view_end >= view_start); - - for (uint64_t i = view_start; i <= view_end; i++) { - if (_state_index.at(i).first.second >= min_length * _view_scale) { - view_state.index = _state_index.at(i).first.first; - view_state.samples = _state_index.at(i).first.second; - view_state.type = (_state_index.at(i).second.first == Slot) ? DEC_CNT : - (_state_index.at(i).second.first == Scode) ? DEC_DATA : DEC_CMD; - view_state.state = _state_index.at(i).second.first; - view_state.data = _state_index.at(i).second.second; - states.push_back(view_state); - } else { - view_state.index = _state_index.at(i).first.first; - view_state.samples = _state_index.at(i).first.second; - view_state.type = DEC_NODETAIL; - view_state.state = 0; - view_state.data = 0; - states.push_back(view_state); - } - } -} - -} // namespace decoder -} // namespace pv diff --git a/DSLogic-gui/pv/decoder/dsdmx512.h b/DSLogic-gui/pv/decoder/dsdmx512.h deleted file mode 100644 index 685c630d..00000000 --- a/DSLogic-gui/pv/decoder/dsdmx512.h +++ /dev/null @@ -1,89 +0,0 @@ -/* - * This file is part of the DSLogic-gui project. - * DSLogic-gui is based on PulseView. - * - * Copyright (C) 2012 Joel Holdsworth - * Copyright (C) 2013 DreamSourceLab - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - - -#ifndef DSLOGIC_PV_DSDMX512_H -#define DSLOGIC_PV_DSDMX512_H - -#include "decoder.h" -#include "../data/logic.h" -#include "../data/logicsnapshot.h" - -#include - -namespace pv { - -namespace data { -class LogicSnapshot; -} - -namespace decoder { - -class dsDmx512 : public Decoder -{ -private: - static const int TableSize = 8; - static const QColor ColorTable[TableSize]; - static const QString StateTable[TableSize]; - - enum {Unknown = 0, Break, Mab, Start, Scode, Stop, Mark, Slot}; - -private: - double get_next_pulse_width(bool level, - uint64_t samplerate, uint64_t &left, uint64_t right, uint64_t &end, - const boost::shared_ptr &snapshot); - - uint8_t get_next_data(bool code, bool &valid, uint8_t &cur_state, - uint64_t samplerate, uint64_t &left, uint64_t right, - const boost::shared_ptr &snapshot); - -public: - dsDmx512(boost::shared_ptr data, - std::list _sel_probes, QMap &_options, QMap _options_index); - - virtual ~dsDmx512(); - - QString get_decode_name(); - - void recode(std::list _sel_probes, QMap & _options, QMap _options_index); - - void decode(); - - void fill_color_table(std::vector & _color_table); - - void fill_state_table(std::vector & _state_table); - - void get_subsampled_states(std::vector &states, - uint64_t start, uint64_t end, - float min_length); - -private: - - int _dmx_index; - uint64_t _max_width; - std::vector< std::pair, std::pair > > _state_index; -}; - -} // namespace decoder -} // namespace pv - -#endif // DSLOGIC_PV_DSDMX512_H diff --git a/DSLogic-gui/pv/decoder/dsi2c.cpp b/DSLogic-gui/pv/decoder/dsi2c.cpp deleted file mode 100644 index b2bc440c..00000000 --- a/DSLogic-gui/pv/decoder/dsi2c.cpp +++ /dev/null @@ -1,366 +0,0 @@ -/* - * This file is part of the DSLogic-gui project. - * DSLogic-gui is based on PulseView. - * - * Copyright (C) 2012 Joel Holdsworth - * Copyright (C) 2013 DreamSourceLab - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "dsi2c.h" - -#include - -using namespace boost; -using namespace std; - -namespace pv { -namespace decoder { - -const QColor dsI2c::ColorTable[TableSize] = { - QColor(255, 255, 255, 150), - QColor(0, 255, 0, 150), - QColor(255, 0, 0, 150), - QColor(0, 255, 0, 150), - QColor(255, 0, 0, 150), - QColor(0, 0, 255, 150), - QColor(0, 0, 255, 150), - QColor(0, 255, 255, 150), -}; - -const QString dsI2c::StateTable[TableSize] = { - "UNKNOWN", - "START", - "STOP", - "ACK", - "NAK", - "READ @", - "WRITE @", - "DATA" -}; - -dsI2c::dsI2c(boost::shared_ptr data, std::list _sel_probes, QMap &_options, QMap _options_index) : - Decoder(data, _sel_probes, _options_index) -{ - (void)_options; - - assert(_sel_probes.size() == 2); - - _scl_index = _sel_probes.front(); - _sda_index = _sel_probes.back(); -} - -dsI2c::~dsI2c() -{ -} - -QString dsI2c::get_decode_name() -{ - return "I2C"; -} - -void dsI2c::recode(std::list _sel_probes, QMap & _options, QMap _options_index) -{ - (void)_options; - - assert(_sel_probes.size() == 2); - _scl_index = _sel_probes.front(); - _sda_index = _sel_probes.back(); - this->_sel_probes = _sel_probes; - this->_options_index = _options_index; - - decode(); -} - -void dsI2c::decode() -{ - assert(_data); - _max_width = 0; - uint8_t cur_state = Unknown; - - const deque< boost::shared_ptr > &snapshots = - _data->get_snapshots(); - if (snapshots.empty()) - return; - - const boost::shared_ptr &snapshot = - snapshots.front(); - - uint64_t flag_index; - uint64_t start_index; - uint64_t stop_index; - bool edge; - uint64_t left = 0; - uint64_t right = snapshot->get_sample_count() - 1; - - if (!_state_index.empty()) - _state_index.clear(); - - while(1) - { - // search start flag - if (snapshot->get_first_edge(flag_index, edge, left, right, _sda_index, -1, _scl_index, 1) == SR_OK) { - left = flag_index + 1; - - if (cur_state == Start) { - stop_index = flag_index; - snapshot->get_edges(_cur_edges, start_index, stop_index, _scl_index, 1); - cmd_decode(snapshot); - data_decode(snapshot); - _cur_edges.clear(); - } - - if (edge == false) { - cur_state = Start; - _state_index.push_back(std::make_pair(std::make_pair(flag_index - 1, 2), std::make_pair(cur_state, 0))); - } else { - cur_state = Stop; - _state_index.push_back(std::make_pair(std::make_pair(flag_index - 1, 2), std::make_pair(cur_state, 0))); - } - start_index = flag_index + 1; - _max_width = max(_max_width, (uint64_t)2); - } else { - if (cur_state == Start) { - stop_index = snapshot->get_sample_count() - 1; - snapshot->get_edges(_cur_edges, start_index, stop_index, _scl_index, 1); - cmd_decode(snapshot); - data_decode(snapshot); - _cur_edges.clear(); - } - _cur_edges.clear(); - break; - } - } - -} - -void dsI2c::cmd_decode(const boost::shared_ptr &snapshot) -{ - uint8_t cur_state; - const uint8_t *src_ptr; - const int unit_size = snapshot->get_unit_size(); - //const uint8_t *const end_src_ptr = (uint8_t*)snapshot->get_data() + - // snapshot->get_sample_count() * unit_size; - - //const uint64_t scl_mask = 1ULL << _scl_index; - const uint64_t sda_mask = 1ULL << _sda_index; - - if (_cur_edges.size() > 9) { - uint8_t slave_addr = 0; - bool read; - bool nak; - //int index = 0; - src_ptr = (uint8_t*)snapshot->get_data(); - slave_addr = ((*(uint64_t*)(src_ptr + _cur_edges[0].first * unit_size) & sda_mask) != 0); - slave_addr = (slave_addr << 1) + ((*(uint64_t*)(src_ptr + _cur_edges[1].first * unit_size) & sda_mask) != 0); - slave_addr = (slave_addr << 1) + ((*(uint64_t*)(src_ptr + _cur_edges[2].first * unit_size) & sda_mask) != 0); - slave_addr = (slave_addr << 1) + ((*(uint64_t*)(src_ptr + _cur_edges[3].first * unit_size) & sda_mask) != 0); - slave_addr = (slave_addr << 1) + ((*(uint64_t*)(src_ptr + _cur_edges[4].first * unit_size) & sda_mask) != 0); - slave_addr = (slave_addr << 1) + ((*(uint64_t*)(src_ptr + _cur_edges[5].first * unit_size) & sda_mask) != 0); - slave_addr = (slave_addr << 1) + ((*(uint64_t*)(src_ptr + _cur_edges[6].first * unit_size) & sda_mask) != 0); - read = ((*(uint64_t*)(src_ptr + _cur_edges[7].first * unit_size) & sda_mask) != 0); - nak = ((*(uint64_t*)(src_ptr + _cur_edges[8].first * unit_size) & sda_mask) != 0); - - cur_state = read ? Read : Write; - _state_index.push_back(std::make_pair(std::make_pair(_cur_edges.at(0).first - 1, _cur_edges.at(7).first - _cur_edges.at(0).first + 2), - std::make_pair(cur_state, slave_addr))); - cur_state = nak ? Nak : Ack; - _state_index.push_back(std::make_pair(std::make_pair(_cur_edges.at(8).first - 1, 2), - std::make_pair(cur_state, 0))); - _max_width = max(_max_width, _cur_edges.at(7).first - _cur_edges.at(0).first + 2); - //_cur_edges.erase(_cur_edges.begin(), _cur_edges.begin() + 9); - } -} - -void dsI2c::data_decode(const boost::shared_ptr &snapshot) -{ - uint8_t cur_state; - const uint8_t *src_ptr; - const int unit_size = snapshot->get_unit_size(); - //const uint8_t *const end_src_ptr = (uint8_t*)snapshot->get_data() + - // snapshot->get_sample_count() * unit_size; - - //const uint64_t scl_mask = 1ULL << _scl_index; - const uint64_t sda_mask = 1ULL << _sda_index; - - uint64_t edge_size = _cur_edges.size(); - uint64_t index = 9; - - while (edge_size > index + 9) { - uint8_t data = 0; - bool nak; - - src_ptr = (uint8_t*)snapshot->get_data(); - data = ((*(uint64_t*)(src_ptr + _cur_edges[index].first * unit_size) & sda_mask) != 0); - data = (data << 1) + ((*(uint64_t*)(src_ptr + _cur_edges[index + 1].first * unit_size) & sda_mask) != 0); - data = (data << 1) + ((*(uint64_t*)(src_ptr + _cur_edges[index + 2].first * unit_size) & sda_mask) != 0); - data = (data << 1) + ((*(uint64_t*)(src_ptr + _cur_edges[index + 3].first * unit_size) & sda_mask) != 0); - data = (data << 1) + ((*(uint64_t*)(src_ptr + _cur_edges[index + 4].first * unit_size) & sda_mask) != 0); - data = (data << 1) + ((*(uint64_t*)(src_ptr + _cur_edges[index + 5].first * unit_size) & sda_mask) != 0); - data = (data << 1) + ((*(uint64_t*)(src_ptr + _cur_edges[index + 6].first * unit_size) & sda_mask) != 0); - data = (data << 1) + ((*(uint64_t*)(src_ptr + _cur_edges[index + 7].first * unit_size) & sda_mask) != 0); - nak = ((*(uint64_t*)(src_ptr + _cur_edges[index + 8].first * unit_size) & sda_mask) != 0); - - cur_state = Data; - _state_index.push_back(std::make_pair(std::make_pair(_cur_edges.at(index).first - 1, _cur_edges.at(index + 7).first - _cur_edges.at(index).first + 2), - std::make_pair(cur_state, data))); - cur_state = nak ? Nak : Ack; - _state_index.push_back(std::make_pair(std::make_pair(_cur_edges.at(index + 8).first - 1, 2), - std::make_pair(cur_state, 0))); - _max_width = max(_max_width, _cur_edges.at(index + 7).first - _cur_edges.at(index).first + 2); - //_cur_edges.erase(_cur_edges.begin(), _cur_edges.begin() + 9); - index += 9; - } -} - -void dsI2c::fill_color_table(std::vector & _color_table) -{ - int i; - for(i = 0; i < TableSize; i++) - _color_table.push_back(ColorTable[i]); -} - -void dsI2c::fill_state_table(std::vector & _state_table) -{ - int i; - for(i = 0; i < TableSize; i++) - _state_table.push_back(StateTable[i]); -} - -void dsI2c::get_subsampled_states(std::vector &states, - uint64_t start, uint64_t end, - float min_length) -{ - ds_view_state view_state; - - const deque< boost::shared_ptr > &snapshots = - _data->get_snapshots(); - if (snapshots.empty()) - return; - const boost::shared_ptr &snapshot = - snapshots.front(); - - assert(end <= snapshot->get_sample_count()); - assert(start <= end); - assert(min_length > 0); - - if (!states.empty()) - states.clear(); - - if (_state_index.empty()) - return; - if (start > _state_index.at(_state_index.size() - 1).first.first) - return; - if (end < _state_index.at(0).first.first) - return; - - if (min_length * _view_scale > _max_width) { - view_state.index = _state_index.at(0).first.first; - view_state.samples = _state_index.at(_state_index.size() - 1).first.first + - _state_index.at(_state_index.size() - 1).first.second - _state_index.at(0).first.first; - view_state.type = DEC_NODETAIL; - view_state.state = 0; - view_state.data = 0; - states.push_back(view_state); - return; - } - - uint64_t view_start = 0; - uint64_t view_end = 0; - uint64_t minIndex = 0; - uint64_t maxIndex = _state_index.size() - 1; - uint64_t i = start * 1.0f / snapshot->get_sample_count() * maxIndex; - bool check_flag = false; - int times = 0; - while(times <= 32) { - if (_state_index.at(i).first.first + _state_index.at(i).first.second >= start) { - check_flag = true; - } else { - minIndex = i; - i = ceil((i + maxIndex) / 2.0f); - } - - if (check_flag) { - if (i == 0) { - view_start = i; - break; - } else if (_state_index.at(i-1).first.first + _state_index.at(i-1).first.second < start) { - view_start = i; - break; - } else { - maxIndex = i; - i = (i + minIndex) / 2; - } - check_flag = false; - } - times++; - } - i = view_start; - check_flag = false; - times = 0; - minIndex = view_start; - //maxIndex = _state_index.size() - 1; - maxIndex = min(_state_index.size() - 1, (size_t)end); - view_end = view_start; - while(times <= 32) { - if (_state_index.at(i).first.first <= end) { - check_flag = true; - } else { - maxIndex = i; - i = (i + minIndex) / 2; - } - - if (check_flag) { - if (i == maxIndex) { - view_end = i; - break; - } else if (_state_index.at(i+1).first.first > end) { - view_end = i; - break; - } else { - minIndex = i; - i = ceil((i + maxIndex) / 2.0f); - } - check_flag = false; - } - times++; - } - - assert(view_end >= view_start); - - for (uint64_t i = view_start; i <= view_end; i++) { - if (_state_index.at(i).first.second >= min_length * _view_scale) { - view_state.index = _state_index.at(i).first.first; - view_state.samples = _state_index.at(i).first.second; - view_state.type = (_state_index.at(i).second.first == Read || - _state_index.at(i).second.first == Write || - _state_index.at(i).second.first == Data) ? DEC_DATA : DEC_CMD; - view_state.state = _state_index.at(i).second.first; - view_state.data = _state_index.at(i).second.second; - states.push_back(view_state); - } else { - view_state.index = _state_index.at(i).first.first; - view_state.samples = _state_index.at(i).first.second; - view_state.type = DEC_NODETAIL; - view_state.state = 0; - view_state.data = 0; - states.push_back(view_state); - } - } -} - -} // namespace decoder -} // namespace pv diff --git a/DSLogic-gui/pv/decoder/dsi2c.h b/DSLogic-gui/pv/decoder/dsi2c.h deleted file mode 100644 index a30ea5c8..00000000 --- a/DSLogic-gui/pv/decoder/dsi2c.h +++ /dev/null @@ -1,87 +0,0 @@ -/* - * This file is part of the DSLogic-gui project. - * DSLogic-gui is based on PulseView. - * - * Copyright (C) 2012 Joel Holdsworth - * Copyright (C) 2013 DreamSourceLab - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - - -#ifndef DSLOGIC_PV_DSI2C_H -#define DSLOGIC_PV_DSI2C_H - -#include "decoder.h" -#include "../data/logic.h" -#include "../data/logicsnapshot.h" - -#include - -namespace pv { - -namespace data { -class LogicSnapshot; -} - -namespace decoder { - -class dsI2c : public Decoder -{ -private: - static const int TableSize = 8; - static const QColor ColorTable[TableSize]; - static const QString StateTable[TableSize]; - - enum {Unknown = 0, Start, Stop, Ack, Nak, Read, Write, Data}; - -private: - void cmd_decode(const boost::shared_ptr &snapshot); - - void data_decode(const boost::shared_ptr &snapshot); - -public: - dsI2c(boost::shared_ptr data, - std::list _sel_probes, QMap &_options, QMap _options_index); - - virtual ~dsI2c(); - - QString get_decode_name(); - - void recode(std::list _sel_probes, QMap & _options, QMap _options_index); - - void decode(); - - void fill_color_table(std::vector & _color_table); - - void fill_state_table(std::vector & _state_table); - - void get_subsampled_states(std::vector &states, - uint64_t start, uint64_t end, - float min_length); - -private: - - int _scl_index; - int _sda_index; - uint64_t _max_width; - std::vector< pv::data::LogicSnapshot::EdgePair > _cur_edges; - std::vector< std::pair, std::pair > > _state_index; -}; - -} // namespace decoder -} // namespace pv - -#endif // DSLOGIC_PV_DSI2C_H diff --git a/DSLogic-gui/pv/decoder/dsserial.cpp b/DSLogic-gui/pv/decoder/dsserial.cpp deleted file mode 100644 index 1039b578..00000000 --- a/DSLogic-gui/pv/decoder/dsserial.cpp +++ /dev/null @@ -1,354 +0,0 @@ -/* - * This file is part of the DSLogic-gui project. - * DSLogic-gui is based on PulseView. - * - * Copyright (C) 2012 Joel Holdsworth - * Copyright (C) 2013 DreamSourceLab - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - - -#include "dsserial.h" - -#include - -using namespace boost; -using namespace std; - -namespace pv { -namespace decoder { - -const QColor dsSerial::ColorTable[TableSize] = { - QColor(255, 255, 255, 150), - QColor(0, 255, 0, 150), - QColor(255, 0, 0, 150), - QColor(0, 255, 0, 150), - QColor(255, 0, 0, 150), - QColor(0, 0, 255, 150), - QColor(0, 0, 255, 150), - QColor(0, 255, 255, 150), -}; - -const QString dsSerial::StateTable[TableSize] = { - "UNKNOWN", - "START", - "STOP", - "START ERROR", - "STOP ERROR", - "PARITY", - "PARITY ERROR", - "DATA" -}; - -dsSerial::dsSerial(boost::shared_ptr data, std::list _sel_probes, QMap &_options, QMap _options_index) : - Decoder(data, _sel_probes, _options_index) -{ - assert(_sel_probes.size() == 1); - - _serial_index = _sel_probes.front(); - - _baudrate = _options.value("baudrate").toULongLong(); - _stopbits = _options.value("stopbits").toFloat(); - _parity = _options.value("parity").toInt(); - _order = _options.value("order").toBool(); - _bits = _options.value("bits").toUInt(); - _idle_level = _options.value("idle").toBool(); -} - -dsSerial::~dsSerial() -{ -} - -QString dsSerial::get_decode_name() -{ - return "Async Serial"; -} - -void dsSerial::recode(std::list _sel_probes, QMap & _options, QMap _options_index) -{ - assert(_sel_probes.size() == 1); - - _serial_index = _sel_probes.front(); - - _baudrate = _options.value("baudrate").toULongLong(); - _stopbits = _options.value("stopbits").toFloat(); - _parity = _options.value("parity").toInt(); - _order = _options.value("order").toBool(); - _bits = _options.value("bits").toUInt(); - _idle_level = _options.value("idle").toBool(); - - - this->_sel_probes = _sel_probes; - this->_options_index = _options_index; - - decode(); -} - -void dsSerial::decode() -{ - assert(_data); - uint8_t cur_state = Unknown; - - const deque< boost::shared_ptr > &snapshots = - _data->get_snapshots(); - if (snapshots.empty()) - return; - - const boost::shared_ptr &snapshot = - snapshots.front(); - - uint64_t flag_index; - uint64_t start_index; - uint64_t stop_index; - bool edge; - uint64_t left = 0; - uint64_t right = snapshot->get_sample_count() - 1; - float samplesPerBit; - //int sampleOffset; - int i; - _max_width = 0; - _min_width = right; - - int start_flag = _idle_level ? 0 : 1; - if (_baudrate != 0) - samplesPerBit = _data->get_samplerate() * 1.0f / _baudrate; - else - samplesPerBit = snapshot->get_min_pulse(left, right, _serial_index); - //sampleOffset = samplesPerBit / 2; - - if (!_state_index.empty()) - _state_index.clear(); - - while(1) - { - // search start flag - bool stop_err = false; - if (snapshot->get_first_edge(flag_index, edge, left, right, _serial_index, start_flag, _serial_index, -1) == SR_OK) { - left = flag_index + floor((_bits + (_parity != -1) + _stopbits + 1) * samplesPerBit); - - cur_state = Start; - _state_index.push_back(std::make_pair(std::make_pair(flag_index, samplesPerBit), std::make_pair(cur_state, 0))); - _max_width = max(_max_width, (uint64_t)samplesPerBit); - _min_width = min(_min_width, (uint64_t)samplesPerBit); - - start_index = flag_index + samplesPerBit * 1.5; - stop_index = flag_index + ceil((_bits + (_parity != -1) + 1) * samplesPerBit); - - if (left < right) { - left -= 0.5*samplesPerBit; - if (_idle_level != ((snapshot->get_sample(stop_index + 0.5*samplesPerBit) & 1ULL << _serial_index) != 0)) { - stop_err = true; - } - if (stop_err) { - cur_state = StopErr; - _state_index.push_back(std::make_pair(std::make_pair(stop_index, samplesPerBit), std::make_pair(cur_state, 0))); - } else { - data_decode(snapshot, start_index, stop_index, samplesPerBit); - cur_state = Stop; - _state_index.push_back(std::make_pair(std::make_pair(stop_index, samplesPerBit), std::make_pair(cur_state, 0))); - } - } else { - _cur_edges.clear(); - break; - } - } else { - _cur_edges.clear(); - break; - } - } - -} - -void dsSerial::data_decode(const boost::shared_ptr &snapshot, uint64_t start, uint64_t stop, float samplesPerBit) -{ - (void)stop; - - uint8_t cur_state; - const uint8_t *src_ptr; - const int unit_size = snapshot->get_unit_size(); - - const uint64_t serial_mask = 1ULL << _serial_index; - - uint32_t data = 0; - uint32_t parity; - int i; - - src_ptr = (uint8_t*)snapshot->get_data(); - if (_order) { - for (i = 0; i < _bits; i++) { - data = data + (((*(uint64_t*)(src_ptr + (int)(start + samplesPerBit * i) * unit_size) & serial_mask) != 0) << i); - } - } else { - for (i = 0; i < _bits; i++) { - data = (data << 1) + ((*(uint64_t*)(src_ptr + (int)(start + samplesPerBit * i) * unit_size) & serial_mask) != 0); - } - } - - cur_state = Data; - _state_index.push_back(std::make_pair(std::make_pair(start - samplesPerBit * 0.5, samplesPerBit * _bits), - std::make_pair(cur_state, data))); - if (_parity != -1) { - parity = ((*(uint64_t*)(src_ptr + (int)(start + samplesPerBit * _bits) * unit_size) & serial_mask) != 0); - parity = parity ^ data; - parity = (parity & 0x55555555) + ((parity >> 1) & 0x55555555); - parity = (parity & 0x33333333) + ((parity >> 2) & 0x33333333); - parity = (parity & 0x0f0f0f0f) + ((parity >> 4) & 0x0f0f0f0f); - parity = (parity & 0x00ff00ff) + ((parity >> 8) & 0x00ff00ff); - parity = (parity & 0x0000ffff) + ((parity >> 16) & 0x0000ffff); - parity = (parity & 0x00000001) ^ _parity; - cur_state = parity ? ParityErr : Parity; - _state_index.push_back(std::make_pair(std::make_pair(start + samplesPerBit * (_bits - 0.5), samplesPerBit), - std::make_pair(cur_state, 0))); - } - _max_width = max(_max_width, (uint64_t)(samplesPerBit * _bits)); -} - -void dsSerial::fill_color_table(std::vector & _color_table) -{ - int i; - for(i = 0; i < TableSize; i++) - _color_table.push_back(ColorTable[i]); -} - -void dsSerial::fill_state_table(std::vector & _state_table) -{ - int i; - for(i = 0; i < TableSize; i++) - _state_table.push_back(StateTable[i]); -} - -void dsSerial::get_subsampled_states(std::vector &states, - uint64_t start, uint64_t end, - float min_length) -{ - ds_view_state view_state; - - const deque< boost::shared_ptr > &snapshots = - _data->get_snapshots(); - if (snapshots.empty()) - return; - const boost::shared_ptr &snapshot = - snapshots.front(); - - assert(end <= snapshot->get_sample_count()); - assert(start <= end); - assert(min_length > 0); - - if (!states.empty()) - states.clear(); - - if (_state_index.empty()) - return; - if (start > _state_index.at(_state_index.size() - 1).first.first) - return; - if (end < _state_index.at(0).first.first) - return; - - if (min_length * _view_scale > _max_width) { - view_state.index = _state_index.at(0).first.first; - view_state.samples = _state_index.at(_state_index.size() - 1).first.first + - _state_index.at(_state_index.size() - 1).first.second - _state_index.at(0).first.first; - view_state.type = DEC_NODETAIL; - view_state.state = 0; - view_state.data = 0; - states.push_back(view_state); - return; - } - - uint64_t view_start = 0; - uint64_t view_end = 0; - uint64_t minIndex = 0; - uint64_t maxIndex = _state_index.size() - 1; - uint64_t i = start * 1.0f / snapshot->get_sample_count() * maxIndex; - bool check_flag = false; - int times = 0; - while(times <= 32) { - if (_state_index.at(i).first.first + _state_index.at(i).first.second >= start) { - check_flag = true; - } else { - minIndex = i; - i = ceil((i + maxIndex) / 2.0f); - } - - if (check_flag) { - if (i == 0) { - view_start = i; - break; - } else if (_state_index.at(i-1).first.first + _state_index.at(i-1).first.second < start) { - view_start = i; - break; - } else { - maxIndex = i; - i = (i + minIndex) / 2; - } - check_flag = false; - } - times++; - } - i = view_start; - check_flag = false; - times = 0; - minIndex = view_start; - //maxIndex = _state_index.size() - 1; - maxIndex = min(_state_index.size() - 1, (size_t)end); - view_end = view_start; - while(times <= 32) { - if (_state_index.at(i).first.first <= end) { - check_flag = true; - } else { - maxIndex = i; - i = (i + minIndex) / 2; - } - - if (check_flag) { - if (i == maxIndex) { - view_end = i; - break; - } else if (_state_index.at(i+1).first.first > end) { - view_end = i; - break; - } else { - minIndex = i; - i = ceil((i + maxIndex) / 2.0f); - } - check_flag = false; - } - times++; - } - - assert(view_end >= view_start); - - for (uint64_t i = view_start; i <= view_end; i++) { - if (_state_index.at(i).first.second >= min_length * _view_scale) { - view_state.index = _state_index.at(i).first.first; - view_state.samples = _state_index.at(i).first.second; - view_state.type = (_state_index.at(i).second.first == Data) ? DEC_DATA : DEC_CMD; - view_state.state = _state_index.at(i).second.first; - view_state.data = _state_index.at(i).second.second; - states.push_back(view_state); - } else { - view_state.index = _state_index.at(i).first.first; - view_state.samples = _state_index.at(i).first.second; - view_state.type = DEC_NODETAIL; - view_state.state = 0; - view_state.data = 0; - states.push_back(view_state); - } - } -} - -} // namespace decoder -} // namespace pv diff --git a/DSLogic-gui/pv/decoder/dsserial.h b/DSLogic-gui/pv/decoder/dsserial.h deleted file mode 100644 index c26c64e0..00000000 --- a/DSLogic-gui/pv/decoder/dsserial.h +++ /dev/null @@ -1,95 +0,0 @@ -/* - * This file is part of the DSLogic-gui project. - * DSLogic-gui is based on PulseView. - * - * Copyright (C) 2012 Joel Holdsworth - * Copyright (C) 2013 DreamSourceLab - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - - -#ifndef DSLOGIC_SV_DSSERIAL_H -#define DSLOGIC_SV_DSSERIAL_H - -#include "decoder.h" -#include "../data/logic.h" -#include "../data/logicsnapshot.h" - -#include - -#include -#include - -namespace pv { - -namespace data { -class LogicSnapshot; -} - -namespace decoder { - -class dsSerial : public Decoder -{ -private: - static const int TableSize = 8; - static const QColor ColorTable[TableSize]; - static const QString StateTable[TableSize]; - - enum {Unknown = 0, Start, Stop, StartErr, StopErr, Parity, ParityErr, Data}; - -private: - void data_decode(const boost::shared_ptr &snapshot, uint64_t start, uint64_t stop, float samplesPerBit); - -public: - dsSerial(boost::shared_ptr data, - std::list _sel_probes, QMap &_options, QMap _options_index); - - virtual ~dsSerial(); - - QString get_decode_name(); - - void recode(std::list _sel_probes, QMap & _options, QMap _options_index); - - void decode(); - - void fill_color_table(std::vector & _color_table); - - void fill_state_table(std::vector & _state_table); - - void get_subsampled_states(std::vector &states, - uint64_t start, uint64_t end, - float min_length); - -private: - - int _serial_index; - uint64_t _baudrate; - float _stopbits; - int _parity; - bool _order; - int _bits; - bool _idle_level; - - uint64_t _max_width; - uint64_t _min_width; - std::vector< pv::data::LogicSnapshot::EdgePair > _cur_edges; - std::vector< std::pair, std::pair > > _state_index; -}; - -} // namespace decoder -} // namespace pv - -#endif // DSLOGIC_PV_DSSERIAL_H diff --git a/DSLogic-gui/pv/decoder/dsspi.cpp b/DSLogic-gui/pv/decoder/dsspi.cpp deleted file mode 100644 index 3b95507d..00000000 --- a/DSLogic-gui/pv/decoder/dsspi.cpp +++ /dev/null @@ -1,374 +0,0 @@ -/* - * This file is part of the DSLogic-gui project. - * DSLogic-gui is based on PulseView. - * - * Copyright (C) 2012 Joel Holdsworth - * Copyright (C) 2013 DreamSourceLab - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - - -#include "dsspi.h" - -#include - -using namespace boost; -using namespace std; - -namespace pv { -namespace decoder { - -const QColor dsSpi::ColorTable[TableSize] = { - QColor(255, 255, 255, 150), - QColor(255, 0, 0, 150), - QColor(255, 0, 0, 150), - QColor(0, 255, 255, 150), -}; - -const QString dsSpi::StateTable[TableSize] = { - "UNKNOWN", - "CLOCK POLARITY ERROR", - "TOO FEW BITS", - "DATA" -}; - -dsSpi::dsSpi(boost::shared_ptr data, std::list _sel_probes, QMap &_options, QMap _options_index) : - Decoder(data, _sel_probes, _options_index) -{ - _cpol = _options.value("cpol").toBool(); - _cpha = _options.value("cpha").toBool(); - _order = _options.value("order").toBool(); - _bits = _options.value("bits").toUInt(); - _ssn = _options.value("ssn").toInt(); - - if (_ssn == -1) - assert(_sel_probes.size() == 3); - else - assert(_sel_probes.size() == 4); - - if (_ssn != -1) { - _ssn_index = _sel_probes.front(); - _sel_probes.pop_front(); - }else{ - _ssn_index = 0; - } - _sclk_index = _sel_probes.front(); - _sel_probes.pop_front(); - _mosi_index = _sel_probes.front(); - _sel_probes.pop_front(); - _miso_index = _sel_probes.front(); - _sel_probes.pop_front(); -} - -dsSpi::~dsSpi() -{ -} - -QString dsSpi::get_decode_name() -{ - return "SPI"; -} - -void dsSpi::recode(std::list _sel_probes, QMap & _options, QMap _options_index) -{ - _cpol = _options.value("cpol").toBool(); - _cpha = _options.value("cpha").toBool(); - _order = _options.value("order").toBool(); - _bits = _options.value("bits").toUInt(); - _ssn = _options.value("ssn").toInt(); - - if (_ssn == -1) - assert(_sel_probes.size() == 3); - else - assert(_sel_probes.size() == 4); - - if (_ssn != -1) { - _ssn_index = _sel_probes.front(); - _sel_probes.pop_front(); - _sel_probes.push_back(_ssn_index); - }else{ - _ssn_index = 0; - } - _sclk_index = _sel_probes.front(); - _sel_probes.pop_front(); - _sel_probes.push_back(_sclk_index); - _mosi_index = _sel_probes.front(); - _sel_probes.pop_front(); - _sel_probes.push_back(_mosi_index); - _miso_index = _sel_probes.front(); - _sel_probes.pop_front(); - _sel_probes.push_back(_miso_index); - - - this->_sel_probes = _sel_probes; - this->_options_index = _options_index; - - decode(); -} - -void dsSpi::decode() -{ - assert(_data); - _max_width = 0; - uint8_t cur_state = Unknown; - - const deque< boost::shared_ptr > &snapshots = - _data->get_snapshots(); - if (snapshots.empty()) - return; - - const boost::shared_ptr &snapshot = - snapshots.front(); - - const uint64_t ssn_mask = 1ULL << _ssn_index; - const uint64_t sclk_mask = 1ULL << _sclk_index; - uint64_t flag_index; - uint64_t start_index; - uint64_t stop_index; - bool edge; - uint64_t left = 0; - uint64_t right = snapshot->get_sample_count() - 1; - - if (!_state_index.empty()) - _state_index.clear(); - - while(1) - { - // search start flag - if (_ssn != -1) { - if (_ssn == ((snapshot->get_sample(left) & ssn_mask) != 0)) { - if (snapshot->get_first_edge(flag_index, edge, left, right, _ssn_index, !_ssn, _ssn_index, -1) == SR_OK) { - start_index = left; - stop_index = flag_index - 1; - } else { - start_index = left; - stop_index = right; - } - } else { - if (snapshot->get_first_edge(flag_index, edge, left, right, _ssn_index, _ssn, _ssn_index, -1) == SR_OK) - start_index = flag_index; - else - break; - - if (snapshot->get_first_edge(flag_index, edge, left, right, _ssn_index, !_ssn, _ssn_index, -1) == SR_OK) - stop_index = flag_index - 1; - else - stop_index = right; - } - } else { - start_index = left; - stop_index = right; - } - - if (stop_index - start_index > 15) { - if (_cpol == ((snapshot->get_sample(start_index) & sclk_mask) != 0)) { - snapshot->get_edges(_cur_edges, start_index, stop_index, _sclk_index, !(_cpha ^ _cpol)); - data_decode(snapshot); - } else { - cur_state = ClockErr; - _state_index.push_back(std::make_pair(std::make_pair(start_index, stop_index - start_index), - std::make_pair(cur_state, 0))); - _max_width = max(_max_width, stop_index - start_index); - } - } - - left = stop_index + 1; - if (left >= right) - break; - } -} - -void dsSpi::data_decode(const boost::shared_ptr &snapshot) -{ - uint8_t cur_state; - const uint8_t *src_ptr; - const int unit_size = snapshot->get_unit_size(); - - const uint64_t miso_mask = 1ULL << _miso_index; - const uint64_t mosi_mask = 1ULL << _mosi_index; - - uint64_t edge_size = _cur_edges.size(); - uint64_t index = 0; - src_ptr = (uint8_t*)snapshot->get_data(); - - while (edge_size >= index + _bits) { - uint8_t mosi = 0; - uint8_t miso = 0; - int i; - - if (_order) { - for (i = 0; i < _bits; i++) { - mosi = (mosi << 1) + ((*(uint64_t*)(src_ptr + _cur_edges[index + i].first * unit_size) & mosi_mask) != 0); - miso = (miso << 1) + ((*(uint64_t*)(src_ptr + _cur_edges[index + i].first * unit_size) & miso_mask) != 0); - } - } else { - for (i = 0; i < _bits; i++) { - mosi = mosi + (((*(uint64_t*)(src_ptr + _cur_edges[index + i].first * unit_size) & mosi_mask) != 0) << i); - miso = miso + (((*(uint64_t*)(src_ptr + _cur_edges[index + i].first * unit_size) & miso_mask) != 0) << i); - } - } - - cur_state = Data; - _state_index.push_back(std::make_pair(std::make_pair(_cur_edges.at(index).first - 1, _cur_edges.at(index + _bits - 1).first - _cur_edges.at(index).first + 2), - std::make_pair(cur_state, mosi))); - - _max_width = max(_max_width, _cur_edges.at(index + _bits - 1).first - _cur_edges.at(index).first + 2); - index += 8; - } - - if (edge_size > index + 1 && edge_size < index + _bits) { - cur_state = BitsErr; - _state_index.push_back(std::make_pair(std::make_pair(_cur_edges.at(index + 1).first - 1, _cur_edges.at(_cur_edges.size() - 1).first - _cur_edges.at(index + 1).first + 2), - std::make_pair(cur_state, 0))); - } -} - -void dsSpi::fill_color_table(std::vector & _color_table) -{ - int i; - for(i = 0; i < TableSize; i++) - _color_table.push_back(ColorTable[i]); -} - -void dsSpi::fill_state_table(std::vector & _state_table) -{ - int i; - for(i = 0; i < TableSize; i++) - _state_table.push_back(StateTable[i]); -} - -void dsSpi::get_subsampled_states(std::vector &states, - uint64_t start, uint64_t end, - float min_length) -{ - ds_view_state view_state; - - const deque< boost::shared_ptr > &snapshots = - _data->get_snapshots(); - if (snapshots.empty()) - return; - const boost::shared_ptr &snapshot = - snapshots.front(); - - assert(end <= snapshot->get_sample_count()); - assert(start <= end); - assert(min_length > 0); - - if (!states.empty()) - states.clear(); - - if (_state_index.empty()) - return; - if (start > _state_index.at(_state_index.size() - 1).first.first) - return; - if (end < _state_index.at(0).first.first) - return; - - if (min_length * _view_scale > _max_width) { - view_state.index = _state_index.at(0).first.first; - view_state.samples = _state_index.at(_state_index.size() - 1).first.first + - _state_index.at(_state_index.size() - 1).first.second - _state_index.at(0).first.first; - view_state.type = DEC_NODETAIL; - view_state.state = 0; - view_state.data = 0; - states.push_back(view_state); - return; - } - - uint64_t view_start = 0; - uint64_t view_end = 0; - uint64_t minIndex = 0; - uint64_t maxIndex = _state_index.size() - 1; - uint64_t i = start * 1.0f / snapshot->get_sample_count() * maxIndex; - bool check_flag = false; - int times = 0; - while(times <= 32) { - if (_state_index.at(i).first.first + _state_index.at(i).first.second >= start) { - check_flag = true; - } else { - minIndex = i; - i = ceil((i + maxIndex) / 2.0f); - } - - if (check_flag) { - if (i == 0) { - view_start = i; - break; - } else if (_state_index.at(i-1).first.first + _state_index.at(i-1).first.second < start) { - view_start = i; - break; - } else { - maxIndex = i; - i = (i + minIndex) / 2; - } - check_flag = false; - } - times++; - } - i = view_start; - check_flag = false; - times = 0; - minIndex = view_start; - //maxIndex = _state_index.size() - 1; - maxIndex = min(_state_index.size() - 1, (size_t)end); - view_end = view_start; - while(times <= 32) { - if (_state_index.at(i).first.first <= end) { - check_flag = true; - } else { - maxIndex = i; - i = (i + minIndex) / 2; - } - - if (check_flag) { - if (i == maxIndex) { - view_end = i; - break; - } else if (_state_index.at(i+1).first.first > end) { - view_end = i; - break; - } else { - minIndex = i; - i = ceil((i + maxIndex) / 2.0f); - } - check_flag = false; - } - times++; - } - - assert(view_end >= view_start); - - for (uint64_t i = view_start; i <= view_end; i++) { - if (_state_index.at(i).first.second >= min_length * _view_scale) { - view_state.index = _state_index.at(i).first.first; - view_state.samples = _state_index.at(i).first.second; - view_state.type = (_state_index.at(i).second.first == Data) ? DEC_DATA : DEC_CMD; - view_state.state = _state_index.at(i).second.first; - view_state.data = _state_index.at(i).second.second; - states.push_back(view_state); - } else { - view_state.index = _state_index.at(i).first.first; - view_state.samples = _state_index.at(i).first.second; - view_state.type = DEC_NODETAIL; - view_state.state = 0; - view_state.data = 0; - states.push_back(view_state); - } - } -} - -} // namespace decoder -} // namespace pv diff --git a/DSLogic-gui/pv/decoder/dsspi.h b/DSLogic-gui/pv/decoder/dsspi.h deleted file mode 100644 index edf601a5..00000000 --- a/DSLogic-gui/pv/decoder/dsspi.h +++ /dev/null @@ -1,97 +0,0 @@ -/* - * This file is part of the DSLogic-gui project. - * DSLogic-gui is based on PulseView. - * - * Copyright (C) 2012 Joel Holdsworth - * Copyright (C) 2013 DreamSourceLab - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - - -#ifndef DSLOGIC_PV_DSSPI_H -#define DSLOGIC_PV_DSSPI_H - -#include "decoder.h" -#include "../data/logic.h" -#include "../data/logicsnapshot.h" - -#include - -#include -#include - -namespace pv { - -namespace data { -class LogicSnapshot; -} - -namespace decoder { - -class dsSpi : public Decoder -{ -private: - static const int TableSize = 4; - static const QColor ColorTable[TableSize]; - static const QString StateTable[TableSize]; - - enum {Unknown = 0, ClockErr, BitsErr, Data}; - -private: - void data_decode(const boost::shared_ptr &snapshot); - -public: - dsSpi(boost::shared_ptr data, - std::list _sel_probes, QMap &_options, QMap _options_index); - - virtual ~dsSpi(); - - QString get_decode_name(); - - void recode(std::list _sel_probes, QMap & _options, QMap _options_index); - - void decode(); - - void fill_color_table(std::vector & _color_table); - - void fill_state_table(std::vector & _state_table); - - void get_subsampled_states(std::vector &states, - uint64_t start, uint64_t end, - float min_length); - -private: - - int _ssn_index; - int _sclk_index; - int _mosi_index; - int _miso_index; - - bool _cpol; - bool _cpha; - int _bits; - bool _order; - int _ssn; - - uint64_t _max_width; - std::vector< pv::data::LogicSnapshot::EdgePair > _cur_edges; - std::vector< std::pair, std::pair > > _state_index; -}; - -} // namespace decoder -} // namespace pv - -#endif // DSLOGIC_PV_DSSPI_H diff --git a/DSLogic-gui/pv/decoder/i2cconfig.ui b/DSLogic-gui/pv/decoder/i2cconfig.ui deleted file mode 100644 index a487f7b7..00000000 --- a/DSLogic-gui/pv/decoder/i2cconfig.ui +++ /dev/null @@ -1,127 +0,0 @@ - - - I2cConfig - - - - 0 - 0 - 385 - 204 - - - - - 385 - 204 - - - - - 385 - 204 - - - - Dialog - - - - - 30 - 160 - 341 - 32 - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - 30 - 50 - 301 - 73 - - - - - QFormLayout::AllNonFixedFieldsGrow - - - 16 - - - 16 - - - - - - 0 - 0 - - - - SCL - - - - - - - - - - SDA - - - - - - - - - - - - - buttonBox - accepted() - I2cConfig - accept() - - - 248 - 254 - - - 157 - 274 - - - - - buttonBox - rejected() - I2cConfig - reject() - - - 316 - 260 - - - 286 - 274 - - - - - diff --git a/DSLogic-gui/pv/decoder/serialconfig.ui b/DSLogic-gui/pv/decoder/serialconfig.ui deleted file mode 100644 index 23f6aa5a..00000000 --- a/DSLogic-gui/pv/decoder/serialconfig.ui +++ /dev/null @@ -1,535 +0,0 @@ - - - SerialConfig - - - - 0 - 0 - 434 - 507 - - - - - 434 - 507 - - - - - 434 - 507 - - - - Dialog - - - - - 70 - 460 - 341 - 32 - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - 30 - 20 - 351 - 81 - - - - Probes Setting - - - - - 20 - 30 - 331 - 41 - - - - - QFormLayout::AllNonFixedFieldsGrow - - - 16 - - - 16 - - - - - - 0 - 0 - - - - Serial - - - - - - - - - - - - - 30 - 120 - 351 - 301 - - - - Mode Setting - - - - - 20 - 30 - 331 - 261 - - - - - QFormLayout::AllNonFixedFieldsGrow - - - 16 - - - 16 - - - - - - 0 - 0 - - - - Baudrate - - - - - - - 6 - - - - 150 - - - - - 300 - - - - - 600 - - - - - 1200 - - - - - 2400 - - - - - 4800 - - - - - 9600 - - - - - 14400 - - - - - 19200 - - - - - 28800 - - - - - 38400 - - - - - 57600 - - - - - 76800 - - - - - 115200 - - - - - 230400 - - - - - 460800 - - - - - 921600 - - - - - - - - Use Autobaud - - - - - - - Stopbits - - - - - - - - 1 - - - - - 1.5 - - - - - 2 - - - - - - - - Parity - - - - - - - 0 - - - - No Parity - - - - - Odd Parity - - - - - Even Parity - - - - - - - - Bit Order - - - - - - - - LSB - Least Significant Bit First - - - - - MSB - Most Significant Bit First - - - - - - - - Bits - - - - - - - 4 - - - - 4 - - - - - 5 - - - - - 6 - - - - - 7 - - - - - 8 - - - - - 9 - - - - - 10 - - - - - 11 - - - - - 12 - - - - - 13 - - - - - 14 - - - - - 15 - - - - - 16 - - - - - 17 - - - - - 18 - - - - - 19 - - - - - 20 - - - - - 21 - - - - - 22 - - - - - 23 - - - - - 24 - - - - - 25 - - - - - 26 - - - - - 27 - - - - - 28 - - - - - 29 - - - - - 30 - - - - - 31 - - - - - 32 - - - - - - - - Idle level - - - - - - - - High - start = L, stop = H - - - - - Low - start = H, stop = L - - - - - - - - groupBox - buttonBox - groupBox_2 - - - - - buttonBox - accepted() - SerialConfig - accept() - - - 248 - 254 - - - 157 - 274 - - - - - buttonBox - rejected() - SerialConfig - reject() - - - 316 - 260 - - - 286 - 274 - - - - - diff --git a/DSLogic-gui/pv/decoder/spiconfig.ui b/DSLogic-gui/pv/decoder/spiconfig.ui deleted file mode 100644 index 85028bee..00000000 --- a/DSLogic-gui/pv/decoder/spiconfig.ui +++ /dev/null @@ -1,381 +0,0 @@ - - - SpiConfig - - - - 0 - 0 - 442 - 535 - - - - - 442 - 535 - - - - - 442 - 535 - - - - Dialog - - - - - 70 - 480 - 341 - 32 - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - 20 - 20 - 351 - 191 - - - - Probes Setting - - - - - 30 - 30 - 241 - 145 - - - - - QFormLayout::AllNonFixedFieldsGrow - - - 16 - - - 16 - - - - - - 0 - 0 - - - - SSn - - - - - - - - - - SCLK - - - - - - - - - - MOSI - - - - - - - - - - MISO - - - - - - - - - - - - - 30 - 230 - 351 - 221 - - - - Mode Setting - - - - - 20 - 30 - 311 - 181 - - - - - QFormLayout::AllNonFixedFieldsGrow - - - 16 - - - 16 - - - - - - 0 - 0 - - - - CPOL - - - - - - - - 0 - Clock is Low when Inactive - - - - - 1 - Clock is High when Inactive - - - - - - - - CPHA - - - - - - - - 0 - Data is Valid on Clock Rising Edge - - - - - 1 - Data is Valid on Clock Falling Edge - - - - - - - - Bits - - - - - - - 4 - - - - 4 - - - - - 5 - - - - - 6 - - - - - 7 - - - - - 8 - - - - - 9 - - - - - 10 - - - - - 11 - - - - - 12 - - - - - 13 - - - - - 14 - - - - - 15 - - - - - 16 - - - - - 24 - - - - - 32 - - - - - - - - Order - - - - - - - - MSB - Most Significant Bit First - - - - - LSB - Least Significant Bit First - - - - - - - - SSn - - - - - - - - SSn is Active Low - - - - - SSn is Active High - - - - - Don't use SSn - - - - - - - - groupBox - buttonBox - groupBox_2 - - - - - buttonBox - accepted() - SpiConfig - accept() - - - 248 - 254 - - - 157 - 274 - - - - - buttonBox - rejected() - SpiConfig - reject() - - - 316 - 260 - - - 286 - 274 - - - - - diff --git a/DSLogic-gui/pv/decoder/wire1config.ui b/DSLogic-gui/pv/decoder/wire1config.ui deleted file mode 100644 index e0212854..00000000 --- a/DSLogic-gui/pv/decoder/wire1config.ui +++ /dev/null @@ -1,103 +0,0 @@ - - - Wire1Config - - - - 0 - 0 - 360 - 150 - - - - - 360 - 150 - - - - - 360 - 150 - - - - Dialog - - - - - 10 - 100 - 341 - 32 - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - 120 - 40 - 151 - 20 - - - - - - - 40 - 40 - 84 - 16 - - - - 1-Wire - - - - - - - buttonBox - accepted() - Wire1Config - accept() - - - 248 - 254 - - - 157 - 274 - - - - - buttonBox - rejected() - Wire1Config - reject() - - - 316 - 260 - - - 286 - 274 - - - - - diff --git a/DSLogic-gui/pv/dialogs/connect.cpp b/DSLogic-gui/pv/dialogs/connect.cpp deleted file mode 100644 index f4cffbca..00000000 --- a/DSLogic-gui/pv/dialogs/connect.cpp +++ /dev/null @@ -1,223 +0,0 @@ -/* - * This file is part of the DSLogic-gui project. - * DSLogic-gui is based on PulseView. - * - * Copyright (C) 2012 Joel Holdsworth - * Copyright (C) 2013 DreamSourceLab - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - - -#include - -#include "connect.h" - -#include "pv/devicemanager.h" - -extern "C" { -/* __STDC_FORMAT_MACROS is required for PRIu64 and friends (in C++). */ -#define __STDC_FORMAT_MACROS -#include -#include -} - -using namespace std; - -extern sr_context *sr_ctx; - -namespace pv { -namespace dialogs { - -Connect::Connect(QWidget *parent, pv::DeviceManager &device_manager) : - QDialog(parent), - _device_manager(device_manager), - _layout(this), - _form(this), - _form_layout(&_form), - _drivers(&_form), - _serial_device(&_form), - _scan_button(tr("Scan for Devices"), this), - _device_list(this), - _button_box(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, - Qt::Horizontal, this) -{ - setWindowTitle(tr("Connect to Device")); - - connect(&_button_box, SIGNAL(accepted()), this, SLOT(accept())); - connect(&_button_box, SIGNAL(rejected()), this, SLOT(reject())); - - populate_drivers(); - connect(&_drivers, SIGNAL(activated(int)), - this, SLOT(device_selected(int))); - - _form.setLayout(&_form_layout); - _form_layout.addRow(tr("Driver"), &_drivers); - - _form_layout.addRow(tr("Serial Port"), &_serial_device); - - unset_connection(); - - connect(&_scan_button, SIGNAL(pressed()), - this, SLOT(scan_pressed())); - - setLayout(&_layout); - _layout.addWidget(&_form); - _layout.addWidget(&_scan_button); - _layout.addWidget(&_device_list); - _layout.addWidget(&_button_box); -} - -struct sr_dev_inst* Connect::get_selected_device() const -{ - const QListWidgetItem *const item = _device_list.currentItem(); - if (!item) - return NULL; - - return (sr_dev_inst*)item->data(Qt::UserRole).value(); -} - -void Connect::populate_drivers() -{ - gsize num_opts = 0; - const int32_t *hwopts; - struct sr_dev_driver **drivers = sr_driver_list(); - GVariant *gvar_opts; - - for (int i = 0; drivers[i]; ++i) { - /** - * We currently only support devices that can deliver - * samples at a fixed samplerate i.e. oscilloscopes and - * logic analysers. - * @todo Add support for non-monotonic devices i.e. DMMs - * and sensors. - */ - bool supported_device = false; - if ((sr_config_list(drivers[i], SR_CONF_DEVICE_OPTIONS, - &gvar_opts, NULL) == SR_OK)) { - hwopts = (const int32_t *)g_variant_get_fixed_array(gvar_opts, - &num_opts, sizeof(int32_t)); - for (unsigned int j = 0; j < num_opts; j++) - if (hwopts[j] == SR_CONF_SAMPLERATE) { - supported_device = true; - break; - } - } - - if (supported_device) - _drivers.addItem(QString("%1 (%2)").arg( - drivers[i]->longname).arg(drivers[i]->name), - qVariantFromValue((void*)drivers[i])); - } -} - -void Connect::unset_connection() -{ - _device_list.clear(); - _serial_device.hide(); - _form_layout.labelForField(&_serial_device)->hide(); - _button_box.button(QDialogButtonBox::Ok)->setDisabled(true); -} - -void Connect::set_serial_connection() -{ - _serial_device.show(); - _form_layout.labelForField(&_serial_device)->show(); -} - -void Connect::scan_pressed() -{ - _device_list.clear(); - - const int index = _drivers.currentIndex(); - if (index == -1) - return; - - sr_dev_driver *const driver = (sr_dev_driver*)_drivers.itemData( - index).value(); - - GSList *drvopts = NULL; - - if (_serial_device.isVisible()) { - sr_config *const src = (sr_config*)g_try_malloc(sizeof(sr_config)); - src->key = SR_CONF_CONN; - const QByteArray byteArray = _serial_device.text().toUtf8(); - src->data = g_variant_new_string((const gchar*)byteArray.constData()); - drvopts = g_slist_append(drvopts, src); - } - - const list devices = _device_manager.driver_scan( - driver, drvopts); - - g_slist_free_full(drvopts, (GDestroyNotify)free_drvopts); - - BOOST_FOREACH(sr_dev_inst *const sdi, devices) - { - const string title = DeviceManager::format_device_title(sdi); - QString text(title.c_str()); - if (sdi->probes) { - text += QString(" with %1 probes").arg( - g_slist_length(sdi->probes)); - } - - QListWidgetItem *const item = new QListWidgetItem(text, - &_device_list); - item->setData(Qt::UserRole, qVariantFromValue((void*)sdi)); - _device_list.addItem(item); - } - - _device_list.setCurrentRow(0); - _button_box.button(QDialogButtonBox::Ok)->setDisabled(false); -} - -void Connect::device_selected(int index) -{ - gsize num_opts = 0; - const int32_t *hwopts; - GVariant *gvar_list; - sr_dev_driver *const driver = (sr_dev_driver*)_drivers.itemData( - index).value(); - - unset_connection(); - - if ((sr_config_list(driver, SR_CONF_SCAN_OPTIONS, - &gvar_list, NULL) == SR_OK)) { - hwopts = (const int32_t *)g_variant_get_fixed_array(gvar_list, - &num_opts, sizeof(int32_t)); - - for (unsigned int i = 0; i < num_opts; i++) { - switch(hwopts[i]) { - case SR_CONF_SERIALCOMM: - set_serial_connection(); - break; - - default: - continue; - } - - break; - } - g_variant_unref(gvar_list); - } -} - -void Connect::free_drvopts(struct sr_config *src) -{ - g_variant_unref(src->data); - g_free(src); -} - -} // namespace dialogs -} // namespace pv diff --git a/DSLogic-gui/pv/dialogs/connect.h b/DSLogic-gui/pv/dialogs/connect.h deleted file mode 100644 index 7de68283..00000000 --- a/DSLogic-gui/pv/dialogs/connect.h +++ /dev/null @@ -1,90 +0,0 @@ -/* - * This file is part of the DSLogic-gui project. - * DSLogic-gui is based on PulseView. - * - * Copyright (C) 2012 Joel Holdsworth - * Copyright (C) 2013 DreamSourceLab - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - - -#ifndef DSLOGIC_PV_CONNECT_H -#define DSLOGIC_PV_CONNECT_H - -#include -#include -#include -#include -#include -#include -#include -#include - -struct sr_config; -struct sr_dev_inst; - -namespace pv { - -class DeviceManager; - -namespace dialogs { - -class Connect : public QDialog -{ - Q_OBJECT - -public: - Connect(QWidget *parent, pv::DeviceManager &device_manager); - - struct sr_dev_inst* get_selected_device() const; - -private: - void populate_drivers(); - - void unset_connection(); - - void set_serial_connection(); - -private slots: - void device_selected(int index); - - void scan_pressed(); - -private: - static void free_drvopts(sr_config *src); - -private: - pv::DeviceManager &_device_manager; - - QVBoxLayout _layout; - - QWidget _form; - QFormLayout _form_layout; - - QComboBox _drivers; - - QLineEdit _serial_device; - - QPushButton _scan_button; - QListWidget _device_list; - - QDialogButtonBox _button_box; -}; - -} // namespace dialogs -} // namespace pv - -#endif // DSLOGIC_PV_CONNECT_H diff --git a/DSLogic-gui/pv/dialogs/search.ui b/DSLogic-gui/pv/dialogs/search.ui deleted file mode 100644 index 5737b703..00000000 --- a/DSLogic-gui/pv/dialogs/search.ui +++ /dev/null @@ -1,166 +0,0 @@ - - - Search - - - - 0 - 0 - 486 - 231 - - - - Search - - - - - 130 - 180 - 341 - 32 - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - 40 - 20 - 351 - 204 - - - - - 16 - - - 16 - - - - - - - - Search Value - - - - - - - 6 - - - - - X: Don't care - - - - - - - 0: Low level - - - - - - - 1: High level - - - - - - - R: Rising edge - - - - - - - F: Falling edge - - - - - - - C: Rising/Falling edge - - - - - - - - - 0 - - - - - 1 1 1 1 1 1 - - - - - - - 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 - - - - - - - - - - - - buttonBox - accepted() - Search - accept() - - - 248 - 254 - - - 157 - 274 - - - - - buttonBox - rejected() - Search - reject() - - - 316 - 260 - - - 286 - 274 - - - - - diff --git a/DSLogic-gui/pv/dialogs/trig.ui b/DSLogic-gui/pv/dialogs/trig.ui deleted file mode 100644 index ce388938..00000000 --- a/DSLogic-gui/pv/dialogs/trig.ui +++ /dev/null @@ -1,91 +0,0 @@ - - - Trig - - - - 0 - 0 - 597 - 481 - - - - Dialog - - - - - 230 - 390 - 341 - 32 - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - 40 - 40 - 411 - 21 - - - - Qt::Horizontal - - - - Trigger Positon: - - - - - Qt::Horizontal - - - - - - - - buttonBox - accepted() - Trig - accept() - - - 248 - 254 - - - 157 - 274 - - - - - buttonBox - rejected() - Trig - reject() - - - 316 - 260 - - - 286 - 274 - - - - - diff --git a/DSLogic-gui/pv/dock/fakelineedit.cpp b/DSLogic-gui/pv/dock/fakelineedit.cpp deleted file mode 100644 index 98c90c4c..00000000 --- a/DSLogic-gui/pv/dock/fakelineedit.cpp +++ /dev/null @@ -1,42 +0,0 @@ -/* - * This file is part of the DSLogic-gui project. - * DSLogic-gui is based on PulseView. - * - * Copyright (C) 2012 Joel Holdsworth - * Copyright (C) 2013 DreamSourceLab - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "fakelineedit.h" -#include - -namespace pv { -namespace dock { - -FakeLineEdit::FakeLineEdit(QLineEdit *parent) : - QLineEdit(parent) -{ -} - -void FakeLineEdit::mousePressEvent(QMouseEvent *event) -{ - if (event->button() & Qt::LeftButton) { - trigger(); - } -} - -} // namespace dock -} // namespace pv diff --git a/DSLogic-gui/pv/dock/fakelineedit.h b/DSLogic-gui/pv/dock/fakelineedit.h deleted file mode 100644 index fda3156a..00000000 --- a/DSLogic-gui/pv/dock/fakelineedit.h +++ /dev/null @@ -1,53 +0,0 @@ -/* - * This file is part of the DSLogic-gui project. - * DSLogic-gui is based on PulseView. - * - * Copyright (C) 2012 Joel Holdsworth - * Copyright (C) 2013 DreamSourceLab - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef FAKELINEEDIT_H -#define FAKELINEEDIT_H - -#include - -namespace pv { - -class SigSession; - -namespace dock { - -class FakeLineEdit : public QLineEdit -{ - Q_OBJECT -public: - explicit FakeLineEdit(QLineEdit *parent = 0); - -private: - void mousePressEvent(QMouseEvent * event); - -signals: - void trigger(); - -public slots: - -}; - -} // namespace dock -} // namespace pv - -#endif // FAKELINEEDIT_H diff --git a/DSLogic-gui/pv/prop/binding/binding_deviceoptions.cpp b/DSLogic-gui/pv/prop/binding/binding_deviceoptions.cpp deleted file mode 100644 index 05b488e2..00000000 --- a/DSLogic-gui/pv/prop/binding/binding_deviceoptions.cpp +++ /dev/null @@ -1,276 +0,0 @@ -/* - * This file is part of the DSLogic-gui project. - * DSLogic-gui is based on PulseView. - * - * Copyright (C) 2012 Joel Holdsworth - * Copyright (C) 2013 DreamSourceLab - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include - -#include -#include - -#include - -#include "deviceoptions.h" - -#include -#include -#include -#include - -using namespace boost; -using namespace std; - -namespace pv { -namespace prop { -namespace binding { - -DeviceOptions::DeviceOptions(struct sr_dev_inst *sdi) : - _sdi(sdi) -{ - GVariant *gvar_opts, *gvar_list; - gsize num_opts; - - if ((sr_config_list(sdi->driver, SR_CONF_DEVICE_CONFIGS, - &gvar_opts, sdi) != SR_OK)) - /* Driver supports no device instance options. */ - return; - - const int *const options = (const int32_t *)g_variant_get_fixed_array( - gvar_opts, &num_opts, sizeof(int32_t)); - for (unsigned int i = 0; i < num_opts; i++) { - const struct sr_config_info *const info = - sr_config_info_get(options[i]); - - if (!info) - continue; - - const int key = info->key; - - if(sr_config_list(_sdi->driver, key, &gvar_list, _sdi) != SR_OK) - gvar_list = NULL; - - const QString name(info->name); - - switch(key) - { - case SR_CONF_SAMPLERATE: - bind_samplerate(name, gvar_list); - break; - - case SR_CONF_CAPTURE_RATIO: - bind_int(name, key, "%", pair(0, 100)); - break; - - case SR_CONF_DEVICE_MODE: - case SR_CONF_PATTERN_MODE: - case SR_CONF_BUFFERSIZE: - case SR_CONF_TRIGGER_SOURCE: - case SR_CONF_FILTER: - case SR_CONF_COUPLING0: - case SR_CONF_COUPLING1: - case SR_CONF_EN_CH0: - case SR_CONF_EN_CH1: - case SR_CONF_OPERATION_MODE: - case SR_CONF_ZERO: - bind_enum(name, key, gvar_list); - break; - - case SR_CONF_RLE: - bind_bool(name, key); - break; - - case SR_CONF_CLOCK_TYPE: - bind_bool(name, key); - break; - - case SR_CONF_TIMEBASE: - bind_enum(name, key, gvar_list, print_timebase); - break; - - case SR_CONF_VDIV0: - case SR_CONF_VDIV1: - bind_enum(name, key, gvar_list, print_vdiv); - break; - default: - gvar_list = NULL; - } - - if (gvar_list) - g_variant_unref(gvar_list); - } - g_variant_unref(gvar_opts); -} - -GVariant* DeviceOptions::config_getter( - const struct sr_dev_inst *sdi, int key) -{ - GVariant *data = NULL; - if (sr_config_get(sdi->driver, key, &data, sdi) != SR_OK) { - qDebug() << - "WARNING: Failed to get value of config id" << key; - return NULL; - } - return data; -} - -void DeviceOptions::config_setter( - const struct sr_dev_inst *sdi, int key, GVariant* value) -{ - if (sr_config_set(sdi, key, value) != SR_OK) - qDebug() << "WARNING: Failed to set value of sample rate"; -} - -void DeviceOptions::bind_bool(const QString &name, int key) -{ - _properties.push_back(boost::shared_ptr( - new Bool(name, bind(config_getter, _sdi, key), - bind(config_setter, _sdi, key, _1)))); -} - -void DeviceOptions::bind_enum(const QString &name, int key, - GVariant *const gvar_list, boost::function printer) -{ - GVariant *gvar; - GVariantIter iter; - vector< pair > values; - - assert(gvar_list); - - g_variant_iter_init (&iter, gvar_list); - while ((gvar = g_variant_iter_next_value (&iter))) - values.push_back(make_pair(gvar, printer(gvar))); - - _properties.push_back(boost::shared_ptr( - new Enum(name, values, - bind(config_getter, _sdi, key), - bind(config_setter, _sdi, key, _1)))); -} - -void DeviceOptions::bind_int(const QString &name, int key, QString suffix, - optional< std::pair > range) -{ - _properties.push_back(boost::shared_ptr( - new Int(name, suffix, range, - bind(config_getter, _sdi, key), - bind(config_setter, _sdi, key, _1)))); -} - -QString DeviceOptions::print_gvariant(GVariant *const gvar) -{ - QString s; - - if (g_variant_is_of_type(gvar, G_VARIANT_TYPE("s"))) - s = QString(g_variant_get_string(gvar, NULL)); - else - { - gchar *const text = g_variant_print(gvar, FALSE); - s = QString(text); - g_free(text); - } - - return s; -} - -void DeviceOptions::bind_samplerate(const QString &name, - GVariant *const gvar_list) -{ - GVariant *gvar_list_samplerates; - - assert(gvar_list); - - if ((gvar_list_samplerates = g_variant_lookup_value(gvar_list, - "samplerate-steps", G_VARIANT_TYPE("at")))) - { - gsize num_elements; - const uint64_t *const elements = - (const uint64_t *)g_variant_get_fixed_array( - gvar_list_samplerates, &num_elements, sizeof(uint64_t)); - - assert(num_elements == 3); - - _properties.push_back(boost::shared_ptr( - new Double(name, 0, QObject::tr("Hz"), - make_pair((double)elements[0], (double)elements[1]), - (double)elements[2], - bind(samplerate_double_getter, _sdi), - bind(samplerate_double_setter, _sdi, _1)))); - - g_variant_unref(gvar_list_samplerates); - } - else if ((gvar_list_samplerates = g_variant_lookup_value(gvar_list, - "samplerates", G_VARIANT_TYPE("at")))) - { - bind_enum(name, SR_CONF_SAMPLERATE, - gvar_list_samplerates, print_samplerate); - g_variant_unref(gvar_list_samplerates); - } -} - -QString DeviceOptions::print_samplerate(GVariant *const gvar) -{ - char *const s = sr_samplerate_string( - g_variant_get_uint64(gvar)); - const QString qstring(s); - g_free(s); - return qstring; -} - -GVariant* DeviceOptions::samplerate_double_getter( - const struct sr_dev_inst *sdi) -{ - GVariant *const gvar = config_getter(sdi, SR_CONF_SAMPLERATE); - - if(!gvar) - return NULL; - - GVariant *const gvar_double = g_variant_new_double( - g_variant_get_uint64(gvar)); - - g_variant_unref(gvar); - - return gvar_double; -} - -void DeviceOptions::samplerate_double_setter( - struct sr_dev_inst *sdi, GVariant *value) -{ - GVariant *const gvar = g_variant_new_uint64( - g_variant_get_double(value)); - config_setter(sdi, SR_CONF_SAMPLERATE, gvar); -} - -QString DeviceOptions::print_timebase(GVariant *const gvar) -{ - uint64_t p, q; - g_variant_get(gvar, "(tt)", &p, &q); - return QString(sr_period_string(p * q)); -} - -QString DeviceOptions::print_vdiv(GVariant *const gvar) -{ - uint64_t p, q; - g_variant_get(gvar, "(tt)", &p, &q); - return QString(sr_voltage_string(p, q)); -} - -} // binding -} // prop -} // pv - diff --git a/DSLogic-gui/pv/toolbars/devicebar.cpp b/DSLogic-gui/pv/toolbars/devicebar.cpp deleted file mode 100644 index 3d38a31c..00000000 --- a/DSLogic-gui/pv/toolbars/devicebar.cpp +++ /dev/null @@ -1,142 +0,0 @@ -/* - * This file is part of the DSLogic-gui project. - * DSLogic-gui is based on PulseView. - * - * Copyright (C) 2012 Joel Holdsworth - * Copyright (C) 2013 DreamSourceLab - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - - -#include - -#include - -#include - -#include - -#include -#include -#include - -#include "devicebar.h" - -#include -#include - -using namespace std; - -namespace pv { -namespace toolbars { - -DeviceBar::DeviceBar(QWidget *parent) : - QToolBar("Device Bar", parent), - _enable(true), - _device_selector(this), - _configure_button(this) -{ - setMovable(false); - - connect(&_device_selector, SIGNAL(currentIndexChanged (int)), - this, SLOT(on_device_selected())); - connect(&_configure_button, SIGNAL(clicked()), - this, SLOT(on_configure())); - - _configure_button.setIcon(QIcon::fromTheme("configure", - QIcon(":/icons/params.png"))); - - addWidget(&_device_selector); - addWidget(&_configure_button); -} - -void DeviceBar::set_device_list( - const std::list &devices) -{ - disconnect(&_device_selector, SIGNAL(currentIndexChanged (int)), - this, SLOT(on_device_selected())); - _device_selector.clear(); - - BOOST_FOREACH (sr_dev_inst *sdi, devices) { - const string title = DeviceManager::format_device_title(sdi); - _device_selector.addItem(title.c_str(), - qVariantFromValue((void*)sdi)); - } - connect(&_device_selector, SIGNAL(currentIndexChanged (int)), - this, SLOT(on_device_selected())); -} - -struct sr_dev_inst* DeviceBar::get_selected_device() const -{ - const int index = _device_selector.currentIndex(); - if (index < 0) - return NULL; - - return (sr_dev_inst*)_device_selector.itemData( - index).value(); -} - -void DeviceBar::set_selected_device(struct sr_dev_inst *const sdi, bool discon) -{ - if (discon) - disconnect(&_device_selector, SIGNAL(currentIndexChanged (int)), - this, SLOT(on_device_selected())); - - for (int i = 0; i < _device_selector.count(); i++) - if (sdi == _device_selector.itemData(i).value()) { - _device_selector.setCurrentIndex(i); - if (!discon) - device_selected(); - break; - } - - if (discon) - connect(&_device_selector, SIGNAL(currentIndexChanged (int)), - this, SLOT(on_device_selected())); -} - -void DeviceBar::on_device_selected() -{ - device_selected(); -} - -void DeviceBar::on_configure() -{ - int dev_mode, ret; - sr_dev_inst *const sdi = get_selected_device(); - assert(sdi); - - dev_mode = sdi->mode; - - pv::dialogs::DeviceOptions dlg(this, sdi); - ret = dlg.exec(); - if (ret == QDialog::Accepted) { - if (dev_mode != sdi->mode) { - device_selected(); - } else { - device_updated(); - } - } -} - -void DeviceBar::enable_toggle(bool enable) -{ - _device_selector.setDisabled(!enable); - _configure_button.setDisabled(!enable); -} - -} // namespace toolbars -} // namespace pv diff --git a/DSLogic-gui/pv/toolbars/devicebar.h b/DSLogic-gui/pv/toolbars/devicebar.h deleted file mode 100644 index c977fb4d..00000000 --- a/DSLogic-gui/pv/toolbars/devicebar.h +++ /dev/null @@ -1,72 +0,0 @@ -/* - * This file is part of the DSLogic-gui project. - * DSLogic-gui is based on PulseView. - * - * Copyright (C) 2012 Joel Holdsworth - * Copyright (C) 2013 DreamSourceLab - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - - -#ifndef DSLOGIC_PV_TOOLBARS_DEVICEBAR_H -#define DSLOGIC_PV_TOOLBARS_DEVICEBAR_H - -#include - -#include - -#include -#include -#include - -struct st_dev_inst; -class QAction; - -namespace pv { -namespace toolbars { - -class DeviceBar : public QToolBar -{ - Q_OBJECT - -public: - DeviceBar(QWidget *parent); - - void set_device_list(const std::list &devices); - - struct sr_dev_inst* get_selected_device() const; - void set_selected_device(struct sr_dev_inst *const sdi, bool discon); - - void enable_toggle(bool enable); - -signals: - void device_selected(); - void device_updated(); - -private slots: - void on_device_selected(); - void on_configure(); - -private: - bool _enable; - QComboBox _device_selector; - QToolButton _configure_button; -}; - -} // namespace toolbars -} // namespace pv - -#endif // DSLOGIC_PV_TOOLBARS_DEVICEBAR_H diff --git a/DSLogic-gui/pv/view/protocolsignal.cpp b/DSLogic-gui/pv/view/protocolsignal.cpp deleted file mode 100644 index 9ad38309..00000000 --- a/DSLogic-gui/pv/view/protocolsignal.cpp +++ /dev/null @@ -1,191 +0,0 @@ -/* - * This file is part of the DSLogic-gui project. - * DSLogic-gui is based on PulseView. - * - * Copyright (C) 2012 Joel Holdsworth - * Copyright (C) 2013 DreamSourceLab - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - - -#include - -#include - -#include "protocolsignal.h" -#include "view.h" -#include "pv/data/logic.h" -#include "pv/data/logicsnapshot.h" - - - -using namespace boost; -using namespace std; - -namespace pv { -namespace view { - -const int ProtocolSignal::StateHeight = 16; -const int ProtocolSignal::StateRound = 3; - -ProtocolSignal::ProtocolSignal(QString name, boost::shared_ptr data, - pv::decoder::Decoder *decoder, std::list probe_index_list, int order, int protocol_index) : - Signal(name, probe_index_list, DS_PROTOCOL, order, protocol_index), - _probe_index_list(probe_index_list), - _data(data), - _decoder(decoder) -{ - assert(_probe_index_list.size() > 0); -} - -ProtocolSignal::~ProtocolSignal() -{ -} - -void ProtocolSignal::set_data(boost::shared_ptr _logic_data, boost::shared_ptr _dso_data, - boost::shared_ptr _analog_data, - boost::shared_ptr _group_data) -{ - (void)_dso_data; - (void)_analog_data; - (void)_group_data; - - assert(_logic_data); - - if (!_cur_states.empty()) - _cur_states.clear(); - - _data = _logic_data; - _decoder->set_data(_logic_data); -} - -void ProtocolSignal::paint(QPainter &p, int y, int left, int right, double scale, double offset) -{ - using pv::view::View; - - //QLineF *line; - - assert(scale > 0); - assert(_data); - assert(right >= left); - - //const float top_offset = y - (_signalHeight + StateHeight) / 2.0f; - const float high_offset = y - _signalHeight + 0.5f; - const float middle_offset = y - _signalHeight / 2 + 0.5f; - //const float low_offset = y + 0.5f; - - const deque< boost::shared_ptr > &snapshots = - _data->get_snapshots(); - if (snapshots.empty()) - return; - - const boost::shared_ptr &snapshot = - snapshots.front(); - - double samplerate = _data->get_samplerate(); - - // Show sample rate as 1Hz when it is unknown - if (samplerate == 0.0) - samplerate = 1.0; - - const double pixels_offset = offset / scale; - const double start_time = _data->get_start_time(); - const int64_t last_sample = snapshot->get_sample_count() - 1; - const double samples_per_pixel = samplerate * scale; - const double start = samplerate * (offset - start_time); - const double end = start + samples_per_pixel * (right - left); - - _decoder->get_subsampled_states(_cur_states, - min(max((int64_t)floor(start), (int64_t)0), last_sample), - min(max((int64_t)ceil(end), (int64_t)0), last_sample), - samples_per_pixel); - - int64_t preX = left; - if (!_cur_states.empty()) { - _decoder->fill_color_table(_color_table); - _decoder->fill_state_table(_state_table); - -// const unsigned int edge_count = 2 * _cur_states.size(); -// QLineF *const edge_lines = new QLineF[edge_count]; -// line = edge_lines; - - vector::const_iterator i; - const int counter_init = 1; - int counter = counter_init; - for ( i = _cur_states.begin(); i != _cur_states.end(); i++) { - const uint64_t index = (*i).index; - const uint64_t samples = (*i).samples; - const int64_t x = (index / samples_per_pixel - - pixels_offset) + left; - const int64_t width = samples / samples_per_pixel; - -// *line++ = QLineF(x, high_offset, x, low_offset); -// *line++ = QLineF(x + width, high_offset, x + width, low_offset); - - p.setPen(dsBlue); - p.setBrush(_color_table.at((*i).state)); - const QRectF state_rect = QRectF(x, high_offset, width, _signalHeight); - //const QRectF cmd_rect = QRectF(x + width / 2 - 5, low_offset - 12, 10, 10); - p.drawRoundedRect(state_rect, StateRound, StateRound); - p.setPen(Qt::black); - if ((*i).type == decoder::DEC_CMD) { - counter = counter_init; - p.drawText(state_rect, Qt::AlignCenter | Qt::AlignCenter, - _state_table.at((*i).state)); - //p.drawRect(cmd_rect); - } else if ((*i).type == decoder::DEC_DATA) { - counter = counter_init; - p.drawText(state_rect, Qt::AlignCenter | Qt::AlignCenter, - _state_table.at((*i).state) + " 0x" + QString::number((*i).data, 16).toUpper()); - } else if ((*i).type == decoder::DEC_CNT) { - p.drawText(state_rect, Qt::AlignCenter | Qt::AlignCenter, - _state_table.at((*i).state) + QString::number(counter) + ": 0x" + QString::number((*i).data, 16).toUpper()); - counter++; - } - if (x > preX) - p.drawLine(preX, middle_offset, x, middle_offset); - preX = x + width; - } - -// p.setPen(_colour); -// p.drawLines(edge_lines, edge_count); -// delete[] edge_lines; - } - p.drawLine(preX, middle_offset, right, middle_offset); -} - -const std::vector< std::pair > ProtocolSignal::cur_edges() const -{ - -} - -void ProtocolSignal::set_decoder(pv::decoder::Decoder *decoder) -{ - (void)decoder; -} - -decoder::Decoder *ProtocolSignal::get_decoder() -{ - return _decoder; -} - -void ProtocolSignal::del_decoder() -{ -} - -} // namespace view -} // namespace pv - diff --git a/DSLogic-gui/pv/view/protocolsignal.h b/DSLogic-gui/pv/view/protocolsignal.h deleted file mode 100644 index 2e37ab8b..00000000 --- a/DSLogic-gui/pv/view/protocolsignal.h +++ /dev/null @@ -1,87 +0,0 @@ -/* - * This file is part of the DSLogic-gui project. - * DSLogic-gui is based on PulseView. - * - * Copyright (C) 2012 Joel Holdsworth - * Copyright (C) 2013 DreamSourceLab - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - - -#ifndef DSLOGIC_PV_PROTOCOLSIGNAL_H -#define DSLOGIC_PV_PROTOCOLSIGNAL_H - -#include "signal.h" -#include "../decoder/decoder.h" - -#include - -#include - -namespace pv { - -namespace data { -class Logic; -} -namespace decoder { -class Decoder; -} - -namespace view { - -class ProtocolSignal : public Signal -{ -private: - static const int StateHeight; - static const int StateRound; - -public: - ProtocolSignal(QString name, - boost::shared_ptr data, - pv::decoder::Decoder *decoder, - std::list index_list, int order, int protocol_index); - - virtual ~ProtocolSignal(); - - void set_data(boost::shared_ptr _logic_data, - boost::shared_ptr _dso_data, - boost::shared_ptr _analog_data, - boost::shared_ptr _group_data); - - void paint(QPainter &p, int y, int left, int right, double scale, - double offset); - - const std::vector< std::pair > cur_edges() const; - - void set_decoder(pv::decoder::Decoder *decoder); - - pv::decoder::Decoder* get_decoder(); - - void del_decoder(); - -private: - std::list _probe_index_list; - boost::shared_ptr _data; - pv::decoder::Decoder * _decoder; - std::vector _cur_states; - std::vector< QColor > _color_table; - std::vector< QString > _state_table; -}; - -} // namespace view -} // namespace pv - -#endif // DSLOGIC_PV_PROTOCOLSIGNAL_H diff --git a/DSLogic-gui/res/DSLogic.bin b/DSLogic-gui/res/DSLogic.bin deleted file mode 100644 index 97558396..00000000 Binary files a/DSLogic-gui/res/DSLogic.bin and /dev/null differ diff --git a/DSLogic-gui/test/COPYING b/DSLogic-gui/test/COPYING deleted file mode 100644 index 94a9ed02..00000000 --- a/DSLogic-gui/test/COPYING +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/DSLogic-gui/test/DSLogic.qrc b/DSLogic-gui/test/DSLogic.qrc deleted file mode 100644 index d7b5e8a1..00000000 --- a/DSLogic-gui/test/DSLogic.qrc +++ /dev/null @@ -1,33 +0,0 @@ - - - icons/search.png - icons/next.png - icons/pre.png - icons/file.png - icons/photo.png - icons/save.png - icons/open.png - icons/params.png - stylesheet.qss - icons/down-arrow.png - icons/slider-handle.png - icons/set.png - icons/add.png - icons/del.png - icons/trigger.png - icons/measure.png - icons/search-bar.png - icons/protocol.png - icons/logo_noColor.png - icons/logo_color.png - icons/logo_muColor.png - icons/about.png - icons/capture.png - icons/stop.png - icons/start.png - icons/dsl_logo.png - icons/logo.png - icons/checkbox.png - icons/radiobutton.png - - diff --git a/DSLogic-gui/test/INSTALL b/DSLogic-gui/test/INSTALL deleted file mode 100644 index 126579be..00000000 --- a/DSLogic-gui/test/INSTALL +++ /dev/null @@ -1,49 +0,0 @@ -------------------------------------------------------------------------------- -INSTALL -------------------------------------------------------------------------------- - -Requirements ------------- - - - git - - g++ - - make - - libtool - - pkg-config >= 0.22 - - cmake >= 2.6 - - libglib >= 2.28.0 - - Qt >= 4.5 - - libboost >= 1.42 (including the following libs): - - libboost-system - - libboost-thread - - libsigrok4DSLogic >= 0.2.0 - - -Building and installing ------------------------ -Get the DSLogic-gui source code from: www.dreamsourcelab.com/download.html -In order to build it, run: - - $ cd DSLogic-gui - $ cmake . - $ make - -For installing PulseView: - - $ make install - -See the following wiki page for more (OS-specific) instructions: - - http://sigrok.org/wiki/Building - - -Creating a source distribution package --------------------------------------- - -In order to build a source package begin with an unconfigured source tree. - - $ mkdir dist - $ cd dist - $ cmake .. - $ make package_source - diff --git a/DSLogic-gui/test/NEWS b/DSLogic-gui/test/NEWS deleted file mode 100644 index e7c2c79c..00000000 --- a/DSLogic-gui/test/NEWS +++ /dev/null @@ -1,5 +0,0 @@ -0.1.0 (2013-12-15) ------------------- - - * Initial release. - diff --git a/DSLogic-gui/test/README b/DSLogic-gui/test/README deleted file mode 100644 index 7452797b..00000000 --- a/DSLogic-gui/test/README +++ /dev/null @@ -1,72 +0,0 @@ -------------------------------------------------------------------------------- -README -------------------------------------------------------------------------------- -DSLogic-gui is GUI for DSLogic software, it's based on PulseView -from the sigrok project. - -The sigrok project aims at creating a portable, cross-platform, -Free/Libre/Open-Source signal analysis software suite that supports various -device types (such as logic analyzers, oscilloscopes, multimeters, and more). - -PulseView is a Qt-based LA/scope/MSO GUI for sigrok. - - -Status ------- - -DSLogic-gui is in a usable state and has had official tarball releases. - -However, it is still work in progress. Some basic functionality -is available and working, but other things are still on the TODO list. - - -Copyright and license ---------------------- - -DSLogic-gui is licensed under the terms of the GNU General Public License -(GPL), version 3 or later. - -While some individual source code files are licensed under the GPLv2+, and -some files are licensed under the GPLv3+, this doesn't change the fact that -the program as a whole is licensed under the terms of the GPLv3+ (e.g. also -due to the fact that it links against GPLv3+ libraries). - -Please see the individual source files for the full list of copyright holders. - - -Copyright notices ------------------ - -A copyright notice indicating a range of years, must be interpreted as having -had copyrightable material added in each of those years. - -Example: - - Copyright (C) 2010-2013 Contributor Name - -is to be interpreted as - - Copyright (C) 2010,2011,2012,2013 Contributor Name - - -Mailing lists -------------- - -There are two mailing lists for sigrok/PulseView: - - https://lists.sourceforge.net/lists/listinfo/sigrok-devel - https://lists.sourceforge.net/lists/listinfo/sigrok-commits - - -IRC ---- - -You can find the sigrok developers in the #sigrok IRC channel on Freenode. - - -Website -------- - - http://sigrok.org/wiki/PulseView - http://dreamsourcelab.com - diff --git a/DSLogic-gui/test/config.h.in b/DSLogic-gui/test/config.h.in deleted file mode 100644 index 89868e31..00000000 --- a/DSLogic-gui/test/config.h.in +++ /dev/null @@ -1,34 +0,0 @@ -/* - * This file is part of the PulseView project. - * - * Copyright (C) 2012 Alexandru Gagniuc - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef _DSLOGIC_CONFIG_H -#define _DSLOGIC_CONFIG_H - -/* Application details */ -#define DS_TITLE "@DS_TITLE@" -#define DS_DESCRIPTION "@DS_DESCRIPTION@" -#define DS_BIN_NAME "@PROJECT_NAME@" - -/* DSLogic version information */ -#define DS_VERSION_MAJOR @DS_VERSION_MAJOR@ -#define DS_VERSION_MINOR @DS_VERSION_MINOR@ -#define DS_VERSION_MICRO @DS_VERSION_MICRO@ -#define DS_VERSION_STRING "@DS_VERSION_STRING@" - -#endif diff --git a/DSLogic-gui/test/extdef.h b/DSLogic-gui/test/extdef.h deleted file mode 100644 index 467b5615..00000000 --- a/DSLogic-gui/test/extdef.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * This file is part of the DSLogic-gui project. - * DSLogic-gui is based on PulseView. - * - * Copyright (C) 2012 Joel Holdsworth - * Copyright (C) 2013 DreamSourceLab - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - - -#ifndef DSLOGIC_EXTDEF_H -#define DSLOGIC_EXTDEF_H - -#define countof(x) (sizeof(x)/sizeof(x[0])) - -#define begin_element(x) (&x[0]) -#define end_element(x) (&x[countof(x)]) - -#endif // DSLOGIC_EXTDEF_H diff --git a/DSLogic-gui/test/main.cpp b/DSLogic-gui/test/main.cpp deleted file mode 100644 index 807f3ced..00000000 --- a/DSLogic-gui/test/main.cpp +++ /dev/null @@ -1,163 +0,0 @@ -/* - * This file is part of the DSLogic-gui project. - * DSLogic-gui is based on PulseView. - * - * Copyright (C) 2012 Joel Holdsworth - * Copyright (C) 2013 DreamSourceLab - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - - -#ifdef ENABLE_SIGROKDECODE -#include /* First, so we avoid a _POSIX_C_SOURCE warning. */ -#endif - -#include -#include - -#include - -#include -#include -#include - -#include "pv/devicemanager.h" -#include "pv/mainwindow.h" - -#include "config.h" - -void usage() -{ - fprintf(stdout, - "Usage:\n" - " %s [OPTION…] [FILE] — %s\n" - "\n" - "Help Options:\n" - " -l, --loglevel Set libsigrok/libsigrokdecode loglevel\n" - " -V, --version Show release version\n" - " -h, -?, --help Show help option\n" - "\n", DS_BIN_NAME, DS_DESCRIPTION); -} - -int main(int argc, char *argv[]) -{ - int ret = 0; - struct sr_context *sr_ctx = NULL; - const char *open_file = NULL; - - QApplication a(argc, argv); - - // Set some application metadata - QApplication::setApplicationVersion(DS_VERSION_STRING); - QApplication::setApplicationName("DSLogic(Beta)"); - QApplication::setOrganizationDomain("http://www.DreamSourceLab.com"); - - // Parse arguments - while (1) { - static const struct option long_options[] = { - {"loglevel", required_argument, 0, 'l'}, - {"version", no_argument, 0, 'V'}, - {"help", no_argument, 0, 'h'}, - {0, 0, 0, 0} - }; - - const int c = getopt_long(argc, argv, - "l:Vh?", long_options, NULL); - if (c == -1) - break; - - switch (c) { - case 'l': - { - const int loglevel = atoi(optarg); - sr_log_loglevel_set(loglevel); - -#ifdef ENABLE_SIGROKDECODE - srd_log_loglevel_set(loglevel); -#endif - - break; - } - - case 'V': - // Print version info - fprintf(stdout, "%s %s\n", DS_TITLE, DS_VERSION_STRING); - return 0; - - case 'h': - case '?': - usage(); - return 0; - } - } - - if (argc - optind > 1) { - fprintf(stderr, "Only one file can be openened.\n"); - return 1; - } else if (argc - optind == 1) - open_file = argv[argc - 1]; - - // Initialise libsigrok - if (sr_init(&sr_ctx) != SR_OK) { - qDebug() << "ERROR: libsigrok init failed."; - return 1; - } - - do { - -#ifdef ENABLE_SIGROKDECODE - // Initialise libsigrokdecode - if (srd_init(NULL) != SRD_OK) { - qDebug() << "ERROR: libsigrokdecode init failed."; - break; - } - - // Load the protocol decoders - srd_decoder_load_all(); -#endif - - try { - // Create the device manager, initialise the drivers - pv::DeviceManager device_manager(sr_ctx); - - // Initialise the main window - pv::MainWindow w(device_manager, open_file); - QFile qss(":/stylesheet.qss"); - qss.open(QFile::ReadOnly); - a.setStyleSheet(qss.readAll()); - qss.close(); - w.show(); - - // Run the application - ret = a.exec(); - - } catch(std::exception e) { - qDebug() << e.what(); - } - -#ifdef ENABLE_SIGROKDECODE - // Destroy libsigrokdecode - srd_exit(); -#endif - - } while (0); - - // Destroy libsigrok - if (sr_ctx) - sr_exit(sr_ctx); - - return ret; -} diff --git a/DSLogic-gui/test/stylesheet.qss b/DSLogic-gui/test/stylesheet.qss deleted file mode 100644 index 7245f278..00000000 --- a/DSLogic-gui/test/stylesheet.qss +++ /dev/null @@ -1,279 +0,0 @@ -palette { - background: rgb(17, 133, 209, 255); - disabled: rgb(200, 200, 200, 255); -} - -QMainWindow { - icon-size: 48px, 48px; -} - -QDialog { - border: none; - background: rgb(17, 133, 209, 255); -} - -QToolBar { - border: none; - /*background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 rgb(0, 75, 165, 255), - stop: 0.05 rgb(31, 164, 227, 255), - stop: 0.5 rgb(17, 133, 209, 255), - stop: 0.95 rgb(0, 102, 185, 255), - stop: 1 rgb(0, 75, 165, 255));*/ - background: rgb(17, 133, 209, 255); - min-height: 50px; -} - -pv--view--View, -pv--view--Viewport{ - margin: 0px; - border: none; - background-color: rgb(255, 255, 255); - padding: 0px; -} - -QToolButton { - border: none; - border-style: flat; - color: white; - font: bold 10ft; - min-height: 50px; - min-width: 50px; -} - -QPushButton:hover, -QToolButton:hover { - background-color: rgb(238, 178, 17, 200); -} - -QPushButton:pressed, -QToolButton:pressed { - background-color: rgb(238, 178, 17, 255); -} - -QPushButton { - padding: 3px; - border: none; - border-style: flat; - border-radius: 4px; - color: white; - background-color: rgb(255, 255, 255, 50); - font: bold 10ft; - min-height: 20px; - min-width: 20px; -} - -/* >>> QToolBar: QLineEdit/QComboBox */ -QLineEdit, -QComboBox:!editable, -QSpinBox { - border: none; - border-radius: 4px; - background-color: white; - padding: 3px; - min-height: 20px; -} - -QLineEdit:disabled, -QComboBox:disabled, -QSpinBox:disabled { - background-color: rgb(200, 200, 200, 255); -} - -QComboBox:!editable { - padding-right: 5px; -} - -/* QComboBox gets the "on" state when the popup is open */ -QComboBox:!editable:on, QToolBar > QComboBox::drop-down:editable:on { - background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 #D3D3D3, stop: 0.4 #D8D8D8, - stop: 0.5 #DDDDDD, stop: 1.0 #E1E1E1); -} - -QComboBox:on { /* shift the text when the popup opens */ - padding-top: 3px; - padding-left: 4px; -} - -QComboBox::drop-down { - subcontrol-origin: padding; - subcontrol-position: top right; - width: 20px; - - border-left-width: 0px; - border-top-right-radius: 4px; /* same radius as the QComboBox */ - border-bottom-right-radius: 4px; -} - -QComboBox::down-arrow { - image: url(:/icons/down-arrow.png); -} -QComboBox::down-arrow:disabled { - image: none; -} - -QComboBox::down-arrow:on { /* shift the arrow when popup is open */ - top: 1px; - left: 1px; -} -/* <<< QToolBar: QLineEdit/QComboBox */ - -/* >>> QDockWidget */ -QDockWidget { - margin: 0px; - background-color: rgb(17, 133, 209, 255); - border: 0px; - padding: 0px; - color: rgb(17, 133, 209, 255); - font-size: 16px; - font-weight: bold; -} - -QDockWidget::title { - margin: 0px; - text-align: left center; - background-color: rgb(255, 255, 255, 255); - border: 0px; - color: white; - padding: 8px; -} -QDockWidget > QWidget{ - margin: 0px; - background-color: rgb(17, 133, 209, 255); - border: 0px; - padding: 0px; -} - -QGroupBox { - margin: 0px; - background-color: rgb(17, 133, 209, 255); - border: 0px; - padding: 40px, 10px, 10px, 10px; - color: white; - font-size: 20px; - font-weight: bold; -} - -QGroupBox::title -{ - subcontrol-origin: margin; - subcontrol-position: top center; - padding: 5 20px; -} -QGroupBox:disabled -{ - color: rgb(200, 200, 200, 255); -} - -QDockWidget > QWidget > QTabWidget::pane{ - margin: 0px; - background-color: rgb(17, 133, 209, 255); - border: 1px solid rgb(255, 255, 255); - border-right-color: rgb(17, 133, 209, 255); /* same as the pane color */ - padding: 0px; -} - -QDockWidget > QWidget > QTabWidget::pane:disabled{ - border: 1px solid rgb(200, 200, 200, 255); - border-right-color: rgb(17, 133, 209, 255); /* same as the pane color */ -} - -QDockWidget > QWidget > QTabWidget > QTabBar::tab -{ - background: transparent; - color: white; - border: 2px solid rgb(238, 178, 17, 255); - border-left-color: rgb(17, 133, 209, 255); /* same as the pane color */ - border-bottom-right-radius: 4px; - border-top-right-radius: 4px; - min-height: 8ex; - padding: 2px; -} -QDockWidget > QWidget > QTabWidget > QTabBar::tab:hover -{ - border: 3px solid rgb(238, 178, 17, 255); - border-left-color: rgb(17, 133, 209, 255); /* same as the pane color */ -} -QDockWidget > QWidget > QTabWidget > QTabBar::tab:selected -{ - color: white; - background: rgb(238, 178, 17, 255); - border-left-color: rgb(17, 133, 209, 255); /* same as the pane color */ -} -QDockWidget > QWidget > QTabWidget > QTabBar::tab:disabled -{ - color: rgb(200, 200, 200, 50); - border: 1px solid rgb(232, 232, 230, 255); - background: transparent; - border-left-color: rgb(17, 133, 209, 255); /* same as the pane color */ -} - -QCheckBox, -QRadioButton, -QLabel { - border: none; - min-height: 20px; -} - -QCheckBox::checked, -QRadioButton::checked { - color: black; -} - -QLabel, -QCheckBox::unchecked, -QRadioButton::unchecked { - color: white; -} - -QCheckBox, -QLabel { - padding: 1px 1px 1px 1px; - margin: 0px; -} - - -QLabel:disabled { - color: rgb(200, 200, 200, 255); -} - -QSlider::groove:horizontal { - border: 1px solid #999999; - height: 2px; - margin: 0px 0; - left: 10px; right: 10px; - border-radius: 4px; -} - -QSlider::handle:horizontal { - border-image:url(:/icons/slider-handle.png); - margin-left: -12px; - margin-right: -12px; - margin-top: -11px; - margin-bottom: -11px; -} - -QSlider::sub-page:horizontal{ - background: qlineargradient(spread:pad, - x1:0, y1:1, x2:0, y2:0, - stop:0 rgba(17, 133, 209, 255), - stop:0.25 rgba(238, 178, 17, 255), - stop:0.75 rgba(238, 178, 17, 255), - stop:1 rgba(17, 133, 209, 255)); - height: 2px; - border-radius: 4px; -} - -QSlider::add-page:horizontal{ - background: qlineargradient(spread:pad, - x1:0, y1:1, x2:0, y2:0, - stop:0 rgba(17, 133, 209, 255), - stop:0.25 rgba(255, 255, 255, 255), - stop:0.75 rgba(255, 255, 255, 255), - stop:1 rgba(17, 133, 209, 255)); - height: 2px; - border-radius: 4px; -} - -/* <<< QDockWidget */