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

gmc-mh-1x-2x: Convert to SR_DF_ANALOG.

This commit is contained in:
Uwe Hermann 2016-05-28 17:43:50 +02:00
parent a6ad49b39f
commit f074822500
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/hardware/gmc-mh-1x-2x/protocol.c
View File

@ -305,6 +305,9 @@ static void decode_rs_18(uint8_t rs, struct dev_context *devc)
devc->scale *= pow(10.0, range - 13); devc->scale *= pow(10.0, range - 13);
break; break;
/* TODO: 29S Mains measurements. */ /* TODO: 29S Mains measurements. */
default:
/* Avoid certain compiler warnings due to (-Wswitch). */
break;
} }
} }
@ -551,6 +554,9 @@ static void decode_rs_2x(uint8_t rs, struct dev_context *devc)
devc->scale *= pow(10.0, range - 13); devc->scale *= pow(10.0, range - 13);
break; break;
/* TODO: 29S Mains measurements. */ /* TODO: 29S Mains measurements. */
default:
/* Avoid certain compiler warnings due to (-Wswitch). */
break;
} }
} }
@ -652,21 +658,24 @@ static void clean_ctmv_rs_v(struct dev_context *devc)
static void send_value(struct sr_dev_inst *sdi) static void send_value(struct sr_dev_inst *sdi)
{ {
struct dev_context *devc; struct dev_context *devc;
struct sr_datafeed_analog_old analog; struct sr_datafeed_analog analog;
struct sr_analog_encoding encoding;
struct sr_analog_meaning meaning;
struct sr_analog_spec spec;
struct sr_datafeed_packet packet; struct sr_datafeed_packet packet;
devc = sdi->priv; devc = sdi->priv;
memset(&analog, 0, sizeof(struct sr_datafeed_analog_old)); sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
analog.channels = sdi->channels; analog.meaning->channels = sdi->channels;
analog.num_samples = 1; analog.num_samples = 1;
analog.mq = devc->mq; analog.meaning->mq = devc->mq;
analog.unit = devc->unit; analog.meaning->unit = devc->unit;
analog.mqflags = devc->mqflags; analog.meaning->mqflags = devc->mqflags;
analog.data = &devc->value; analog.data = &devc->value;
memset(&packet, 0, sizeof(struct sr_datafeed_packet)); memset(&packet, 0, sizeof(struct sr_datafeed_packet));
packet.type = SR_DF_ANALOG_OLD; packet.type = SR_DF_ANALOG;
packet.payload = &analog; packet.payload = &analog;
sr_session_send(sdi, &packet); sr_session_send(sdi, &packet);
@ -858,7 +867,7 @@ static void process_msg_inf_13(struct sr_dev_inst *sdi)
} }
sr_spew("process_msg_inf_13() value=%f scale=%f scale1000=%d mq=%d " sr_spew("process_msg_inf_13() value=%f scale=%f scale1000=%d mq=%d "
"unit=%d mqflags=0x%02" PRIx64, devc->value, devc->scale, "unit=%d mqflags=0x%02" PRIx64, devc->value, devc->scale,
devc->scale1000, devc->mq, devc->unit, devc->mqflags); devc->scale1000, devc->mq, devc->unit, (uint64_t)devc->mqflags);
if (devc->value != NAN) if (devc->value != NAN)
devc->value *= devc->scale * pow(1000.0, devc->scale1000); devc->value *= devc->scale * pow(1000.0, devc->scale1000);
@ -1074,7 +1083,7 @@ SR_PRIV int process_msg14(struct sr_dev_inst *sdi)
} }
sr_spew("process_msg14() value=%f scale=%f scale1000=%d mq=%d " sr_spew("process_msg14() value=%f scale=%f scale1000=%d mq=%d "
"unit=%d mqflags=0x%02" PRIx64, devc->value, devc->scale, "unit=%d mqflags=0x%02" PRIx64, devc->value, devc->scale,
devc->scale1000, devc->mq, devc->unit, devc->mqflags); devc->scale1000, devc->mq, devc->unit, (uint64_t)devc->mqflags);
if (devc->value != NAN) if (devc->value != NAN)
devc->value *= devc->scale * pow(1000.0, devc->scale1000); devc->value *= devc->scale * pow(1000.0, devc->scale1000);

6
src/hardware/gmc-mh-1x-2x/protocol.h
View File

@ -93,9 +93,9 @@ struct dev_context {
gboolean settings_ok; /**< Settings msg received yet. */ gboolean settings_ok; /**< Settings msg received yet. */
int msg_type; /**< Message type (MSGID_INF, ...). */ int msg_type; /**< Message type (MSGID_INF, ...). */
int msg_len; /**< Message length (valid when msg, curr. type known).*/ int msg_len; /**< Message length (valid when msg, curr. type known).*/
int mq; /**< Measured quantity */ enum sr_mq mq; /**< Measured quantity */
int unit; /**< Measured unit */ enum sr_unit unit; /**< Measured unit */
uint64_t mqflags; /**< Measured quantity flags */ enum sr_mqflag mqflags; /**< Measured quantity flags */
float value; /**< Measured value */ float value; /**< Measured value */
float scale; /**< Scale for value. */ float scale; /**< Scale for value. */
int8_t scale1000; /**< Additional scale factor 1000x. */ int8_t scale1000; /**< Additional scale factor 1000x. */