X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Frigol-ds%2Fprotocol.c;h=77af43e94d3d3af4f7bdc93a693dd9f781d03c61;hb=f9c6b5cfd3c0f6cb737f6a68f69034ce6819f36d;hp=98570ff0d7e6e0208b24cadc826fbd4bebec91b8;hpb=e264ebded832bc6556f88f771e9598d998aac6ce;p=libsigrok.git

diff --git a/src/hardware/rigol-ds/protocol.c b/src/hardware/rigol-ds/protocol.c
index 98570ff0..77af43e9 100644
--- a/src/hardware/rigol-ds/protocol.c
+++ b/src/hardware/rigol-ds/protocol.c
@@ -221,7 +221,7 @@ static int rigol_ds_check_stop(const struct sr_dev_inst *sdi)
 		return SR_OK;
 
 	if (rigol_ds_config_set(sdi, ":WAV:SOUR CHAN%d",
-			  ch->index + 1) != SR_OK)
+			ch->index + 1) != SR_OK)
 		return SR_ERR;
 	/* Check that the number of samples will be accepted */
 	if (rigol_ds_config_set(sdi, ":WAV:POIN %d", devc->analog_frame_size) != SR_OK)
@@ -432,7 +432,7 @@ SR_PRIV int rigol_ds_channel_start(const struct sr_dev_inst *sdi)
 		break;
 	case PROTOCOL_V3:
 		if (rigol_ds_config_set(sdi, ":WAV:SOUR CHAN%d",
-				  ch->index + 1) != SR_OK)
+				ch->index + 1) != SR_OK)
 			return SR_ERR;
 		if (devc->data_source != DATA_SOURCE_LIVE) {
 			if (rigol_ds_config_set(sdi, ":WAV:RES") != SR_OK)
@@ -672,7 +672,9 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
 		else
 			for (i = 0; i < len; i++)
 				devc->data[i] = (128 - devc->buffer[i]) * vdiv - offset;
-		sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
+		float vdivlog = log10f(vdiv);
+		int digits = -(int)vdivlog + (vdivlog < 0.0);
+		sr_analog_init(&analog, &encoding, &meaning, &spec, digits);
 		analog.meaning->channels = g_slist_append(NULL, ch);
 		analog.num_samples = len;
 		analog.data = devc->data;