BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mic-985xx: Correctly report SR_CONF_THERMOMETER/_HYGROMETER. 

Some models only log temperature, others log temperature and humidity
(so they need different drvopts).
This commit is contained in:
Uwe Hermann 2014-11-18 23:43:38 +01:00
parent 20a7cd07c9
commit e07edc83d6
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/hardware/mic-985xx/api.c
View File

@ -25,7 +25,11 @@ static const uint32_t scanopts[] = {
SR_CONF_SERIALCOMM, SR_CONF_SERIALCOMM,
}; };
static const uint32_t drvopts[] = { static const uint32_t drvopts_temp[] = {
SR_CONF_THERMOMETER,
};
static const uint32_t drvopts_temp_hum[] = {
SR_CONF_THERMOMETER, SR_CONF_THERMOMETER,
SR_CONF_HYGROMETER, SR_CONF_HYGROMETER,
}; };
@ -195,7 +199,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
} }
static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
const struct sr_channel_group *cg) const struct sr_channel_group *cg, int idx)
{ {
(void)cg; (void)cg;
@ -205,12 +209,18 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t)); scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
break; break;
case SR_CONF_DEVICE_OPTIONS: case SR_CONF_DEVICE_OPTIONS:
if (!sdi) if (!sdi && !mic_devs[idx].has_humidity) {
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
drvopts, ARRAY_SIZE(drvopts), sizeof(uint32_t)); drvopts_temp, ARRAY_SIZE(drvopts_temp),
else sizeof(uint32_t));
} else if (!sdi && mic_devs[idx].has_humidity) {
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
drvopts_temp_hum, ARRAY_SIZE(drvopts_temp_hum),
sizeof(uint32_t));
} else {
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
devopts, ARRAY_SIZE(devopts), sizeof(uint32_t)); devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
}
break; break;
default: default:
return SR_ERR_NA; return SR_ERR_NA;
@ -261,6 +271,10 @@ static GSList *scan_##X(GSList *options) { return scan(options, X); }
static GSList *dev_list_##X(void) { return dev_list(X); } static GSList *dev_list_##X(void) { return dev_list(X); }
#define HW_DEV_CLEAR(X) \ #define HW_DEV_CLEAR(X) \
static int dev_clear_##X(void) { return dev_clear(X); } static int dev_clear_##X(void) { return dev_clear(X); }
#define HW_CONFIG_LIST(X) \
static int config_list_##X(uint32_t key, GVariant **data, \
const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { \
return config_list(key, data, sdi, cg, X); }
#define HW_DEV_ACQUISITION_START(X) \ #define HW_DEV_ACQUISITION_START(X) \
static int dev_acquisition_start_##X(const struct sr_dev_inst *sdi, \ static int dev_acquisition_start_##X(const struct sr_dev_inst *sdi, \
void *cb_data) { return dev_acquisition_start(sdi, cb_data, X); } void *cb_data) { return dev_acquisition_start(sdi, cb_data, X); }
@ -272,6 +286,7 @@ HW_CLEANUP(ID_UPPER) \
HW_SCAN(ID_UPPER) \ HW_SCAN(ID_UPPER) \
HW_DEV_LIST(ID_UPPER) \ HW_DEV_LIST(ID_UPPER) \
HW_DEV_CLEAR(ID_UPPER) \ HW_DEV_CLEAR(ID_UPPER) \
HW_CONFIG_LIST(ID_UPPER) \
HW_DEV_ACQUISITION_START(ID_UPPER) \ HW_DEV_ACQUISITION_START(ID_UPPER) \
SR_PRIV struct sr_dev_driver ID##_driver_info = { \ SR_PRIV struct sr_dev_driver ID##_driver_info = { \
.name = NAME, \ .name = NAME, \
@ -284,7 +299,7 @@ SR_PRIV struct sr_dev_driver ID##_driver_info = { \
.dev_clear = dev_clear_##ID_UPPER, \ .dev_clear = dev_clear_##ID_UPPER, \
.config_get = NULL, \ .config_get = NULL, \
.config_set = config_set, \ .config_set = config_set, \
.config_list = config_list, \ .config_list = config_list_##ID_UPPER, \
.dev_open = std_serial_dev_open, \ .dev_open = std_serial_dev_open, \
.dev_close = std_serial_dev_close, \ .dev_close = std_serial_dev_close, \
.dev_acquisition_start = dev_acquisition_start_##ID_UPPER, \ .dev_acquisition_start = dev_acquisition_start_##ID_UPPER, \