Skip to content

Commit 7ea7edf

Browse files
committed
Add basic support for device type SignalGenerator.
1 parent 409222a commit 7ea7edf

File tree

4 files changed

+7
-1
lines changed

4 files changed

+7
-1
lines changed

src/devices/deviceutil.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ bool is_measurement_driver(shared_ptr<sigrok::Driver> sr_driver)
7474
|| keys.count(sigrok::ConfigKey::ENERGYMETER) > 0
7575
|| keys.count(sigrok::ConfigKey::LCRMETER) > 0
7676
|| keys.count(sigrok::ConfigKey::SCALE) > 0
77+
|| keys.count(sigrok::ConfigKey::SIGNAL_GENERATOR) > 0
7778
|| keys.count(sigrok::ConfigKey::POWERMETER) > 0
7879
|| keys.count(sigrok::ConfigKey::MULTIPLEXER) > 0
7980
|| keys.count(sigrok::ConfigKey::DEMO_DEV) > 0;

src/devices/hardwaredevice.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ HardwareDevice::HardwareDevice(
7777
dt == DeviceType::Energymeter ||
7878
dt == DeviceType::LcrMeter ||
7979
dt == DeviceType::Scale ||
80+
dt == DeviceType::SignalGenerator ||
8081
dt == DeviceType::Powermeter ||
8182
dt == DeviceType::Multiplexer) {
8283
type_ = dt;

src/ui/tabs/tabhelper.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ DeviceTab *get_tab_for_device(Session &session,
6565
device->type() == DeviceType::Energymeter ||
6666
device->type() == DeviceType::LcrMeter ||
6767
device->type() == DeviceType::Scale ||
68+
device->type() == DeviceType::SignalGenerator ||
6869
device->type() == DeviceType::Powermeter ||
6970
device->type() == DeviceType::Multiplexer ||
7071
device->type() == DeviceType::DemoDev) {

src/ui/views/viewhelper.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ BaseView *get_view_for_configurable(Session &session,
117117
configurable->device_type() == DeviceType::LcrMeter ||
118118
configurable->device_type() == DeviceType::Scale ||
119119
configurable->device_type() == DeviceType::Powermeter ||
120+
// TODO: Multiplexers doesn't really fit here
120121
configurable->device_type() == DeviceType::Multiplexer) &&
121122
(configurable->has_get_config(ConfigKey::MeasuredQuantity) ||
122123
configurable->has_set_config(ConfigKey::MeasuredQuantity) ||
@@ -126,7 +127,9 @@ BaseView *get_view_for_configurable(Session &session,
126127
return new MeasurementControlView(session, configurable);
127128
}
128129

129-
// Generic control view
130+
// TODO: SignalGenerators need their own view (waveforms, etc.)
131+
132+
// Generic control view (signal generators for now)
130133
if (!configurable->getable_configs().empty() ||
131134
!configurable->setable_configs().empty()) {
132135

0 commit comments

Comments
 (0)