X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fmaynuo-m97%2Fapi.c;h=54444d623c6d1484bfbe31f3da3d99d512a91c33;hb=a0ade2f933d62fee3dea55475c7a9c69883b8b25;hp=ebc0ddab85a96bd81ce7f1e416215ead5dd878da;hpb=758906aa711c2936e7e9adcb449f70905087a5d9;p=libsigrok.git diff --git a/src/hardware/maynuo-m97/api.c b/src/hardware/maynuo-m97/api.c index ebc0ddab..54444d62 100644 --- a/src/hardware/maynuo-m97/api.c +++ b/src/hardware/maynuo-m97/api.c @@ -140,7 +140,7 @@ static struct sr_dev_inst *probe_device(struct sr_modbus_dev_inst *modbus) sdi->status = SR_ST_INACTIVE; sdi->vendor = g_strdup("Maynuo"); sdi->model = g_strdup(model->name); - sdi->version = g_strdup_printf("v%d.%d", version/10, version%10); + sdi->version = g_strdup_printf("v%d.%d", version / 10, version % 10); sdi->conn = modbus; sdi->driver = &maynuo_m97_driver_info; sdi->inst_type = SR_INST_MODBUS; @@ -363,9 +363,13 @@ static int config_list(uint32_t key, GVariant **data, *data = std_gvar_array_u32(ARRAY_AND_SIZE(devopts_cg)); break; case SR_CONF_VOLTAGE_TARGET: + if (!devc || !devc->model) + return SR_ERR_ARG; *data = std_gvar_min_max_step(0.0, devc->model->max_voltage, 0.001); break; case SR_CONF_CURRENT_LIMIT: + if (!devc || !devc->model) + return SR_ERR_ARG; *data = std_gvar_min_max_step(0.0, devc->model->max_current, 0.0001); break; default: