X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fteleinfo%2Fprotocol.c;h=1938664d03c26dbf962ecda6a7034db6a6bca68b;hb=fe4acad1c2e39040c787b6245284b29c8b1b1c20;hp=9cb9ca82f717f94806db7d4b6b3ee9e070a2496f;hpb=ffa5f177f15dd8c75612d65b20459e7cdccc68b9;p=libsigrok.git

diff --git a/src/hardware/teleinfo/protocol.c b/src/hardware/teleinfo/protocol.c
index 9cb9ca82..1938664d 100644
--- a/src/hardware/teleinfo/protocol.c
+++ b/src/hardware/teleinfo/protocol.c
@@ -56,10 +56,13 @@ static struct sr_channel *teleinfo_find_channel(struct sr_dev_inst *sdi,
 }
 
 static void teleinfo_send_value(struct sr_dev_inst *sdi, const char *channel_name,
-                                float value, int mq, int unit)
+                                float value, enum sr_mq mq, enum sr_unit unit)
 {
 	struct sr_datafeed_packet packet;
-	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_channel *ch;
 
 	ch = teleinfo_find_channel(sdi, channel_name);
@@ -67,17 +70,18 @@ static void teleinfo_send_value(struct sr_dev_inst *sdi, const char *channel_nam
 	if (!ch || !ch->enabled)
 		return;
 
-	memset(&analog, 0, sizeof(struct sr_datafeed_analog_old));
-	analog.channels = g_slist_append(analog.channels, ch);
+	/* Note: digits/spec_digits is actually really 0 for this device! */
+	sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
+	analog.meaning->channels = g_slist_append(analog.meaning->channels, ch);
 	analog.num_samples = 1;
-	analog.mq = mq;
-	analog.unit = unit;
+	analog.meaning->mq = mq;
+	analog.meaning->unit = unit;
 	analog.data = &value;
 
-	packet.type = SR_DF_ANALOG_OLD;
+	packet.type = SR_DF_ANALOG;
 	packet.payload = &analog;
 	sr_session_send(sdi, &packet);
-	g_slist_free(analog.channels);
+	g_slist_free(analog.meaning->channels);
 }
 
 static void teleinfo_handle_measurement(struct sr_dev_inst *sdi,
@@ -92,35 +96,34 @@ static void teleinfo_handle_measurement(struct sr_dev_inst *sdi,
 		return;
 	}
 
-	if (!strcmp(label, "ADCO")) {
+	if (!strcmp(label, "ADCO"))
 		sr_sw_limits_update_samples_read(&devc->sw_limits, 1);
-	} else if (!strcmp(label, "BASE")) {
-		teleinfo_send_value(sdi, "BASE", v, SR_MQ_POWER, SR_UNIT_WATT_HOUR);
-	} else if (!strcmp(label, "HCHP")) {
-		teleinfo_send_value(sdi, "HP"  , v, SR_MQ_POWER, SR_UNIT_WATT_HOUR);
-	} else if (!strcmp(label, "HCHC")) {
-		teleinfo_send_value(sdi, "HC"  , v, SR_MQ_POWER, SR_UNIT_WATT_HOUR);
-	} else if (!strcmp(label, "EJPHN")) {
-		teleinfo_send_value(sdi, "HN"  , v, SR_MQ_POWER, SR_UNIT_WATT_HOUR);
-	} else if (!strcmp(label, "EJPHPM")) {
-		teleinfo_send_value(sdi, "HPM" , v, SR_MQ_POWER, SR_UNIT_WATT_HOUR);
-	} else if (!strcmp(label, "BBRHPJB")) {
-		teleinfo_send_value(sdi, "HPJB", v, SR_MQ_POWER, SR_UNIT_WATT_HOUR);
-	} else if (!strcmp(label, "BBRHPJW")) {
-		teleinfo_send_value(sdi, "HPJW", v, SR_MQ_POWER, SR_UNIT_WATT_HOUR);
-	} else if (!strcmp(label, "BBRHPJR")) {
-		teleinfo_send_value(sdi, "HPJR", v, SR_MQ_POWER, SR_UNIT_WATT_HOUR);
-	} else if (!strcmp(label, "BBRHCJB")) {
-		teleinfo_send_value(sdi, "HCJB", v, SR_MQ_POWER, SR_UNIT_WATT_HOUR);
-	} else if (!strcmp(label, "BBRHCJW")) {
-		teleinfo_send_value(sdi, "HCJW", v, SR_MQ_POWER, SR_UNIT_WATT_HOUR);
-	} else if (!strcmp(label, "BBRHCJR")) {
-		teleinfo_send_value(sdi, "HCJR", v, SR_MQ_POWER, SR_UNIT_WATT_HOUR);
-	} else if (!strcmp(label, "IINST")) {
+	else if (!strcmp(label, "BASE"))
+		teleinfo_send_value(sdi, "BASE", v, SR_MQ_ENERGY, SR_UNIT_WATT_HOUR);
+	else if (!strcmp(label, "HCHP"))
+		teleinfo_send_value(sdi, "HP"  , v, SR_MQ_ENERGY, SR_UNIT_WATT_HOUR);
+	else if (!strcmp(label, "HCHC"))
+		teleinfo_send_value(sdi, "HC"  , v, SR_MQ_ENERGY, SR_UNIT_WATT_HOUR);
+	else if (!strcmp(label, "EJPHN"))
+		teleinfo_send_value(sdi, "HN"  , v, SR_MQ_ENERGY, SR_UNIT_WATT_HOUR);
+	else if (!strcmp(label, "EJPHPM"))
+		teleinfo_send_value(sdi, "HPM" , v, SR_MQ_ENERGY, SR_UNIT_WATT_HOUR);
+	else if (!strcmp(label, "BBRHPJB"))
+		teleinfo_send_value(sdi, "HPJB", v, SR_MQ_ENERGY, SR_UNIT_WATT_HOUR);
+	else if (!strcmp(label, "BBRHPJW"))
+		teleinfo_send_value(sdi, "HPJW", v, SR_MQ_ENERGY, SR_UNIT_WATT_HOUR);
+	else if (!strcmp(label, "BBRHPJR"))
+		teleinfo_send_value(sdi, "HPJR", v, SR_MQ_ENERGY, SR_UNIT_WATT_HOUR);
+	else if (!strcmp(label, "BBRHCJB"))
+		teleinfo_send_value(sdi, "HCJB", v, SR_MQ_ENERGY, SR_UNIT_WATT_HOUR);
+	else if (!strcmp(label, "BBRHCJW"))
+		teleinfo_send_value(sdi, "HCJW", v, SR_MQ_ENERGY, SR_UNIT_WATT_HOUR);
+	else if (!strcmp(label, "BBRHCJR"))
+		teleinfo_send_value(sdi, "HCJR", v, SR_MQ_ENERGY, SR_UNIT_WATT_HOUR);
+	else if (!strcmp(label, "IINST"))
 		teleinfo_send_value(sdi, "IINST", v, SR_MQ_CURRENT, SR_UNIT_AMPERE);
-	} else if (!strcmp(label, "PAPP")) {
+	else if (!strcmp(label, "PAPP"))
 		teleinfo_send_value(sdi, "PAPP", v, SR_MQ_POWER, SR_UNIT_VOLT_AMPERE);
-	}
 }
 
 static gboolean teleinfo_parse_group(struct sr_dev_inst *sdi,
@@ -217,7 +220,7 @@ SR_PRIV int teleinfo_receive_data(int fd, int revents, void *cb_data)
 	}
 
 	if (sr_sw_limits_check(&devc->sw_limits))
-		sdi->driver->dev_acquisition_stop(sdi);
+		sr_dev_acquisition_stop(sdi);
 
 	return TRUE;
 }