* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <config.h>
#include <string.h>
#include <ctype.h>
#include <math.h>
{1e-4, 0, 0, 0, 0, 0, 0, 0}, /* Diode */
{1e-3, 1e-2, 1e-1, 1, 1e1, 1e2, 1e3, 1e4}, /* Frequency */
{1e-2, 0, 0, 0, 0, 0, 0, 0}, /* Loop current */
+ /*
+ * Note: Measurements showed that AC and DC differ
+ * in the factors used, although docs say they should
+ * be the same.
+ */
{1e-8, 1e-7, 0, 0, 0, 0, 0, 0}, /* DCµA */
- {1e-8, 1e-7, 0, 0, 0, 0, 0, 0}, /* ACµA */
+ {1e-7, 1e-6, 0, 0, 0, 0, 0, 0}, /* ACµA */
{1e-6, 1e-5, 0, 0, 0, 0, 0, 0}, /* DCmA */
- {1e-6, 1e-5, 0, 0, 0, 0, 0, 0}, /* ACmA */
+ {1e-5, 1e-4, 0, 0, 0, 0, 0, 0}, /* ACmA */
{1e-3, 0, 0, 0, 0, 0, 0, 0}, /* DCA */
+ /* TODO: Verify factor for ACA */
{1e-3, 0, 0, 0, 0, 0, 0, 0}, /* ACA */
{1e-1, 0, 0, 0, 0, 0, 0, 0}, /* Act+apparent power */
{1e-1, 0, 0, 0, 0, 0, 0, 0}, /* Power factor / freq */
float *result)
{
int i, intval;
- float floatval;
/* Bytes 3-7: Main display value (5 decimal digits) */
if (info->is_open || info->is_ol1) {
} else if (!isdigit(buf[3]) || !isdigit(buf[4]) ||
!isdigit(buf[5]) || !isdigit(buf[6]) || !isdigit(buf[7])) {
sr_dbg("Invalid digits: %02x %02x %02x %02x %02X "
- "(%c %c %c %c %c).", buf[3], buf[4], buf[5], buf[6],
- buf[7]);
+ "(%c %c %c %c %c).",
+ buf[3], buf[4], buf[5], buf[6], buf[7],
+ buf[3], buf[4], buf[5], buf[6], buf[7]);
return SR_ERR;
}
intval *= info->is_sign1 ? -1 : 1;
// intval *= info->is_sign2 ? -1 : 1; /* TODO: Fahrenheit / aux display. */
- floatval = (float)intval;
-
/* Note: The decimal point position will be parsed later. */
- sr_spew("The display value is %f.", floatval);
+ sr_spew("The display value without comma is %05d.", intval);
- *result = floatval;
+ *result = (float)intval;
return SR_OK;
}
info->is_rms = TRUE;
}
-static void handle_flags(struct sr_datafeed_analog *analog,
+static void handle_flags(struct sr_datafeed_analog_old *analog,
float *floatval, const struct vc870_info *info)
{
/*
}
SR_PRIV int sr_vc870_parse(const uint8_t *buf, float *floatval,
- struct sr_datafeed_analog *analog, void *info)
+ struct sr_datafeed_analog_old *analog, void *info)
{
int ret;
struct vc870_info *info_local;
- info_local = (struct vc870_info *)info;
-
info_local = (struct vc870_info *)info;
memset(info_local, 0, sizeof(struct vc870_info));