X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Frigol-ds%2Fapi.c;h=7f21c8886067c8c63b5579578a2410add1f8c532;hb=04e8e01ec6e5f293cde7d53e63fd29f0740af4a3;hp=2089865aa194cae679bb036a6243eae05355015d;hpb=51b294cd013db9d4d15f713c9ed576c343e685d6;p=libsigrok.git

diff --git a/hardware/rigol-ds/api.c b/hardware/rigol-ds/api.c
index 2089865a..7f21c888 100644
--- a/hardware/rigol-ds/api.c
+++ b/hardware/rigol-ds/api.c
@@ -823,9 +823,16 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 					return SR_ERR;
 			}
 		} else if (probe->type == SR_PROBE_LOGIC) {
-			if (probe->enabled)
+			if (probe->enabled) {
 				devc->enabled_digital_probes = g_slist_append(
 						devc->enabled_digital_probes, probe);
+				/* Turn on LA module if currently off. */
+				if (!devc->la_enabled) {
+					if (set_cfg(sdi, ":LA:DISP ON") != SR_OK)
+						return SR_ERR;
+					devc->la_enabled = TRUE;
+				}
+			}
 			if (probe->enabled != devc->digital_channels[probe->index]) {
 				/* Enabled channel is currently disabled, or vice versa. */
 				if (set_cfg(sdi, ":DIG%d:TURN %s", probe->index,
@@ -838,6 +845,11 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 	if (!devc->enabled_analog_probes && !devc->enabled_digital_probes)
 		return SR_ERR;
 
+	/* Turn off LA module if on and no digital probes selected. */
+	if (devc->la_enabled && !devc->enabled_digital_probes)
+		if (set_cfg(sdi, ":LA:DISP OFF") != SR_OK)
+			return SR_ERR;
+
 	if (devc->data_source == DATA_SOURCE_LIVE) {
 		if (set_cfg(sdi, ":RUN") != SR_OK)
 			return SR_ERR;