X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fanalog.c;h=61f1f733aaa8bdc7bd9433d42c4cc5ff7df5429f;hb=2a8f2d41adcd0aa9e498c4eea2a5f82263039e5c;hp=fba7830f22972151f4f616f4dcea81e9e8ae05f8;hpb=a24da9a81358644265465325d12579cd8aa34ba5;p=libsigrok.git

diff --git a/src/analog.c b/src/analog.c
index fba7830f..61f1f733 100644
--- a/src/analog.c
+++ b/src/analog.c
@@ -17,35 +17,54 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <string.h>
 #include <ctype.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
+/** @cond PRIVATE */
 #define LOG_PREFIX "analog"
+/** @endcond */
+
+/**
+ * @file
+ *
+ * Handling and converting analog data.
+ */
+
+/**
+ * @defgroup grp_analog Analog data handling
+ *
+ * Handling and converting analog data.
+ *
+ * @{
+ */
 
 struct unit_mq_string {
 	uint64_t value;
 	char *str;
 };
 
+/* Please use the same order as in enum sr_unit (libsigrok.h). */
 static struct unit_mq_string unit_strings[] = {
 	{ SR_UNIT_VOLT, "V" },
 	{ SR_UNIT_AMPERE, "A" },
 	{ SR_UNIT_OHM, "\xe2\x84\xa6" },
 	{ SR_UNIT_FARAD, "F" },
-	{ SR_UNIT_HENRY, "H" },
 	{ SR_UNIT_KELVIN, "K" },
 	{ SR_UNIT_CELSIUS, "\xc2\xb0""C" },
 	{ SR_UNIT_FAHRENHEIT, "\xc2\xb0""F" },
 	{ SR_UNIT_HERTZ, "Hz" },
 	{ SR_UNIT_PERCENTAGE, "%" },
+	{ SR_UNIT_BOOLEAN, "" },
 	{ SR_UNIT_SECOND, "s" },
 	{ SR_UNIT_SIEMENS, "S" },
 	{ SR_UNIT_DECIBEL_MW, "dBu" },
 	{ SR_UNIT_DECIBEL_VOLT, "dBv" },
+	{ SR_UNIT_UNITLESS, "" },
 	{ SR_UNIT_DECIBEL_SPL, "dB" },
 	{ SR_UNIT_CONCENTRATION, "ppm" },
 	{ SR_UNIT_REVOLUTIONS_PER_MINUTE, "RPM" },
@@ -56,19 +75,23 @@ static struct unit_mq_string unit_strings[] = {
 	{ SR_UNIT_HECTOPASCAL, "hPa" },
 	{ SR_UNIT_HUMIDITY_293K, "%rF" },
 	{ SR_UNIT_DEGREE, "\xc2\xb0" },
+	{ SR_UNIT_HENRY, "H" },
+	{ SR_UNIT_GRAM, "g" },
+	{ SR_UNIT_CARAT, "ct" },
+	{ SR_UNIT_OUNCE, "oz" },
+	{ SR_UNIT_TROY_OUNCE, "oz t" },
+	{ SR_UNIT_POUND, "lb" },
+	{ SR_UNIT_PENNYWEIGHT, "dwt" },
+	{ SR_UNIT_GRAIN, "gr" },
+	{ SR_UNIT_TAEL, "tael" },
+	{ SR_UNIT_MOMME, "momme" },
+	{ SR_UNIT_TOLA, "tola" },
+	{ SR_UNIT_PIECE, "pcs" },
 	ALL_ZERO
 };
 
+/* Please use the same order as in enum sr_mqflag (libsigrok.h). */
 static struct unit_mq_string mq_strings[] = {
-	{ SR_MQFLAG_SPL_FREQ_WEIGHT_A, "(A)" },
-	{ SR_MQFLAG_SPL_FREQ_WEIGHT_C, "(C)" },
-	{ SR_MQFLAG_SPL_FREQ_WEIGHT_Z, "(Z)" },
-	{ SR_MQFLAG_SPL_FREQ_WEIGHT_FLAT, "(SPL)" },
-	{ SR_MQFLAG_SPL_TIME_WEIGHT_S, " S" },
-	{ SR_MQFLAG_SPL_TIME_WEIGHT_F, " F" },
-	{ SR_MQFLAG_SPL_LAT, " LAT" },
-	/* Not a standard function for SLMs, so this is a made-up notation. */
-	{ SR_MQFLAG_SPL_PCT_OVER_ALARM, "%oA" },
 	{ SR_MQFLAG_AC, " AC" },
 	{ SR_MQFLAG_DC, " DC" },
 	{ SR_MQFLAG_RMS, " RMS" },
@@ -78,8 +101,19 @@ static struct unit_mq_string mq_strings[] = {
 	{ SR_MQFLAG_MIN, " MIN" },
 	{ SR_MQFLAG_AUTORANGE, " AUTO" },
 	{ SR_MQFLAG_RELATIVE, " REL" },
+	{ SR_MQFLAG_SPL_FREQ_WEIGHT_A, "(A)" },
+	{ SR_MQFLAG_SPL_FREQ_WEIGHT_C, "(C)" },
+	{ SR_MQFLAG_SPL_FREQ_WEIGHT_Z, "(Z)" },
+	{ SR_MQFLAG_SPL_FREQ_WEIGHT_FLAT, "(SPL)" },
+	{ SR_MQFLAG_SPL_TIME_WEIGHT_S, " S" },
+	{ SR_MQFLAG_SPL_TIME_WEIGHT_F, " F" },
+	{ SR_MQFLAG_SPL_LAT, " LAT" },
+	/* Not a standard function for SLMs, so this is a made-up notation. */
+	{ SR_MQFLAG_SPL_PCT_OVER_ALARM, "%oA" },
+	{ SR_MQFLAG_DURATION, " DURATION" },
 	{ SR_MQFLAG_AVG, " AVG" },
 	{ SR_MQFLAG_REFERENCE, " REF" },
+	{ SR_MQFLAG_UNSTABLE, " UNSTABLE" },
 	ALL_ZERO
 };
 
@@ -180,11 +214,11 @@ SR_API int sr_analog_float_to_string(float value, int digits, char **result)
 
 	/* This produces at least one too many digits */
 	*result = g_strdup_printf("%.*f", digits, value);
-	for (i = 0, cnt = 0; *result[i]; i++) {
-		if (isdigit(*result[i++]))
+	for (i = 0, cnt = 0; (*result)[i]; i++) {
+		if (isdigit((*result)[i++]))
 			cnt++;
 		if (cnt == digits) {
-			*result[i] = 0;
+			(*result)[i] = 0;
 			break;
 		}
 	}
@@ -229,3 +263,16 @@ SR_API int sr_analog_unit_to_string(const struct sr_datafeed_analog2 *analog,
 	return SR_OK;
 }
 
+/*
+ * Set sr_rational r to the given value.
+ *
+ * @param p Numerator
+ * @param q Denominator
+ */
+SR_API void sr_rational_set(struct sr_rational *r, uint64_t p, uint64_t q)
+{
+	r->p = p;
+	r->q = q;
+}
+
+/** @} */