X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhantek-6xxx%2Fapi.c;h=08062add77ec07424012d6a6a78d490d23c63b62;hb=64f628bf8a7b94073de14e34d70a2b23c955f1b0;hp=5596268187ff6e7c3d0d59e92772d1fc8c7cb988;hpb=459324acb8769240513e0bb3ef3c04ad295e8b19;p=libsigrok.git

diff --git a/src/hardware/hantek-6xxx/api.c b/src/hardware/hantek-6xxx/api.c
index 55962681..08062add 100644
--- a/src/hardware/hantek-6xxx/api.c
+++ b/src/hardware/hantek-6xxx/api.c
@@ -36,10 +36,10 @@ static const uint32_t drvopts[] = {
 
 static const uint32_t devopts[] = {
 	SR_CONF_CONN | SR_CONF_GET,
-	SR_CONF_SAMPLERATE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
-	SR_CONF_NUM_VDIV | SR_CONF_GET,
 	SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
 	SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET,
+	SR_CONF_SAMPLERATE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+	SR_CONF_NUM_VDIV | SR_CONF_GET,
 };
 
 static const uint32_t devopts_cg[] = {
@@ -52,7 +52,7 @@ static const char *channel_names[] = {
 };
 
 static const char *dc_coupling[] = {
-	"DC", "DC",
+	"DC",
 };
 
 static const char *acdc_coupling[] = {
@@ -62,14 +62,19 @@ static const char *acdc_coupling[] = {
 static const struct hantek_6xxx_profile dev_profiles[] = {
 	{
 		0x04b4, 0x6022, 0x1d50, 0x608e, 0x0001,
-		"Hantek", "6022BE", "hantek-6022be.fw",
+		"Hantek", "6022BE", "fx2lafw-hantek-6022be.fw",
 		dc_coupling, ARRAY_SIZE(dc_coupling), FALSE,
 	},
 	{
 		0x8102, 0x8102, 0x1d50, 0x608e, 0x0002,
-		"Sainsmart", "DDS120", "sainsmart-dds120.fw",
+		"Sainsmart", "DDS120", "fx2lafw-sainsmart-dds120.fw",
 		acdc_coupling, ARRAY_SIZE(acdc_coupling), TRUE,
 	},
+	{
+		0x04b4, 0x602a, 0x1d50, 0x608e, 0x0003,
+		"Hantek", "6022BL", "fx2lafw-hantek-6022bl.fw",
+		dc_coupling, ARRAY_SIZE(dc_coupling), FALSE,
+	},
 	ALL_ZERO
 };
 
@@ -115,6 +120,7 @@ static struct sr_dev_inst *hantek_6xxx_dev_new(const struct hantek_6xxx_profile
 	}
 	devc->coupling_vals = prof->coupling_vals;
 	devc->coupling_tab_size = prof->coupling_tab_size;
+	devc->has_coupling = prof->has_coupling;
 
 	devc->sample_buf = NULL;
 	devc->sample_buf_write = 0;
@@ -379,7 +385,8 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
 			*data = g_variant_new("(tt)", vdiv[0], vdiv[1]);
 			break;
 		case SR_CONF_COUPLING:
-			*data = g_variant_new_string(devc->coupling_vals[devc->coupling[ch_idx]]);
+			*data = g_variant_new_string((devc->coupling[ch_idx] \
+					== COUPLING_DC) ? "DC" : "AC");
 			break;
 		}
 	}