Improve the hardware abstraction layer

Author: DreamSourceLab

DSView/DSView.qrc

@@ -66,5 +66,6 @@
         <file>icons/manual.png</file>
         <file>icons/bug.png</file>
         <file>icons/support.png</file>
+        <file>icons/showDoc.png</file>
     </qresource>
 </RCC>

DSView/icons/showDoc.png

@@ -33,6 +33,8 @@
 #include <QFile>
 #include <QDir>
 #include <QTranslator>
+#include <QSettings>
+#include <QDesktopServices>
 
 #include "dsapplication.h"
 #include "pv/devicemanager.h"
@@ -158,6 +160,7 @@ int main(int argc, char *argv[])
             qss.close();
 			w.show();
             w.readSettings();
+            w.show_doc();
 
 			// Run the application
             ret = a.exec();

DSView/main.cpp

@@ -273,9 +273,9 @@ void AnalogSnapshot::append_payload_to_envelope_levels()
 
         // Break off if there are no new samples to compute
     	if (e0.ring_length == prev_length)
-    		return;
+            continue;
         if (e0.length == 0)
-            return;
+            continue;
 
         reallocate_envelope(e0);
 

DSView/pv/data/analogsnapshot.cpp

@@ -174,7 +174,7 @@ void MathStack::calc_fft()
     boost::shared_ptr<pv::data::Dso> data;
     boost::shared_ptr<pv::view::DsoSignal> dsoSig;
     BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session.get_signals()) {
-        if (dsoSig = dynamic_pointer_cast<view::DsoSignal>(s)) {
+        if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s))) {
             if (dsoSig->get_index() == _index && dsoSig->enabled()) {
                 data = dsoSig->dso_data();
                 break;

DSView/pv/data/mathstack.cpp

@@ -69,12 +69,12 @@ QString Device::format_device_title() const
 
 	assert(_sdi);
 
-	if (_sdi->vendor && _sdi->vendor[0]) {
-		s << _sdi->vendor;
-		if ((_sdi->model && _sdi->model[0]) ||
-			(_sdi->version && _sdi->version[0]))
-			s << ' ';
-	}
+//	if (_sdi->vendor && _sdi->vendor[0]) {
+//		s << _sdi->vendor;
+//		if ((_sdi->model && _sdi->model[0]) ||
+//			(_sdi->version && _sdi->version[0]))
+//			s << ' ';
+//	}
 
 	if (_sdi->model && _sdi->model[0]) {
 		s << _sdi->model;

DSView/pv/device/device.cpp

@@ -174,7 +174,7 @@ double DevInst::get_sample_time()
     return sample_time;
 }
 
-GSList* DevInst::get_dev_mode_list()
+const GSList* DevInst::get_dev_mode_list()
 {
     assert(_owner);
     sr_dev_inst *const sdi = dev_inst();

DSView/pv/device/devinst.cpp

@@ -107,7 +107,7 @@ class DevInst : public QObject
      * @return The returned device mode list from the driver, or NULL if the
      * 	mode list could not be read.
      */
-    GSList* get_dev_mode_list();
+    const GSList *get_dev_mode_list();
 
     /**
      * @brief Get the device name from the driver

DSView/pv/device/devinst.h

@@ -58,8 +58,8 @@ About::About(QWidget *parent) :
 
     QString thanks = tr("<font size=16>Special Thanks</font><br />"
                         "<a href=\"%1\" style=\"color:#C0C0C0\">All backers on kickstarter</a><br />"
-                        "<a href=\"%1\" style=\"color:#C0C0C0\">All members of Sigrok project</a><br />"
-                        "All contributors of open-source projects</a><br />"
+                        "<a href=\"%2\" style=\"color:#C0C0C0\">All members of Sigrok project</a><br />"
+                        "All contributors of all open-source projects</a><br />"
                         "<br /><br />")
                         .arg("https://www.kickstarter.com/projects/dreamsourcelab/dslogic-multifunction-instruments-for-everyone")
                         .arg("http://sigrok.org/");

DSView/pv/dialogs/about.cpp

@@ -48,10 +48,11 @@ DeviceOptions::DeviceOptions(QWidget *parent, boost::shared_ptr<pv::device::DevI
     _props_box->setLayout(get_property_form(_props_box));
     _layout.addWidget(_props_box);
 
-    QGroupBox *dynamic_box = new QGroupBox(dynamic_widget(_dynamic_layout),
+    _dynamic_box = new QGroupBox(dynamic_widget(_dynamic_layout),
                                           this);
-    dynamic_box->setLayout(&_dynamic_layout);
-    _layout.addWidget(dynamic_box);
+    _dynamic_box->setLayout(&_dynamic_layout);
+    _layout.addWidget(_dynamic_box);
+    _dynamic_box->setVisible(_dynamic_box->title() != NULL);
 
     _layout.addStretch(1);
 	_layout.addWidget(&_button_box);
@@ -333,6 +334,7 @@ void DeviceOptions::mode_check()
 
         if (mode != _mode) {
             dynamic_widget(_dynamic_layout);
+            _dynamic_box->setVisible(_dynamic_box->title() != NULL);
             _mode = mode;
         }
     }
@@ -356,9 +358,12 @@ void DeviceOptions::mode_check()
 void DeviceOptions::channel_check()
 {
     QRadioButton* sc=dynamic_cast<QRadioButton*>(sender());
+    QString text = sc->text();
+    text.remove('&');
     if(sc != NULL)
-        _dev_inst->set_config(NULL, NULL, SR_CONF_CHANNEL_MODE, g_variant_new_string(sc->text().toUtf8().data()));
+        _dev_inst->set_config(NULL, NULL, SR_CONF_CHANNEL_MODE, g_variant_new_string(text.toUtf8().data()));
     dynamic_widget(_dynamic_layout);
+    _dynamic_box->setVisible(_dynamic_box->title() != NULL);
 }
 
 void DeviceOptions::channel_enable()
@@ -424,20 +429,27 @@ QString DeviceOptions::dynamic_widget(QGridLayout& inner_layout) {
         logic_probes(inner_layout);
         return tr("Channels");
     } else if (_dev_inst->dev_inst()->mode == DSO) {
-        _config_button = new QPushButton(tr("Auto Calibration"), this);
-        inner_layout.addWidget(_config_button, 0, 0, 1, 1);
-        connect(_config_button, SIGNAL(clicked()), this, SLOT(zero_adj()));
-        _cali_button = new QPushButton(tr("Manual Calibration"), this);
-        inner_layout.addWidget(_cali_button, 1, 0, 1, 1);
-        connect(_cali_button, SIGNAL(clicked()), this, SLOT(on_calibration()));
-
-        return tr("Calibration");
+        GVariant* gvar = _dev_inst->get_config(NULL, NULL, SR_CONF_HAVE_ZERO);
+        if (gvar != NULL) {
+            bool have_zero = g_variant_get_boolean(gvar);
+            g_variant_unref(gvar);
+
+            if (have_zero) {
+                _config_button = new QPushButton(tr("Auto Calibration"), this);
+                inner_layout.addWidget(_config_button, 0, 0, 1, 1);
+                connect(_config_button, SIGNAL(clicked()), this, SLOT(zero_adj()));
+                _cali_button = new QPushButton(tr("Manual Calibration"), this);
+                inner_layout.addWidget(_cali_button, 1, 0, 1, 1);
+                connect(_cali_button, SIGNAL(clicked()), this, SLOT(on_calibration()));
+
+                return tr("Calibration");
+            }
+        }
     } else if (_dev_inst->dev_inst()->mode == ANALOG) {
         analog_probes(inner_layout);
         return tr("Channels");
-    } else {
-        return tr("Undefined");
     }
+    return NULL;
 }
 
 void DeviceOptions::analog_probes(QGridLayout &layout)