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

bbcgm-m2110: Minor cosmetics.

This commit is contained in:
Uwe Hermann 2013-12-19 00:31:26 +01:00
parent 825da8b20f
commit 95ecc76546
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hardware/common/dmm/m2110.c
View File

@ -17,20 +17,20 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
/** \file /**
* BBC Goerz Metrawatt M2110 ASCII protocol parser. * @file
* *
* Most probably the simplest multimeter protocol ever ;-) . * BBC Goerz Metrawatt M2110 ASCII protocol parser.
*
* Most probably the simplest multimeter protocol ever ;-) .
*/ */
#include <string.h> #include <string.h>
#include <math.h> #include <math.h>
#include <glib.h> #include <glib.h>
#include "libsigrok.h" #include "libsigrok.h"
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
/* Message logging helpers with subsystem-specific prefix string. */ /* Message logging helpers with subsystem-specific prefix string. */
#define LOG_PREFIX "bbcgm-m2110: " #define LOG_PREFIX "bbcgm-m2110: "
#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args) #define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
@ -47,10 +47,10 @@ SR_PRIV gboolean sr_m2110_packet_valid(const uint8_t *buf)
if ((buf[7] != '\r') || (buf[8] != '\n')) if ((buf[7] != '\r') || (buf[8] != '\n'))
return FALSE; return FALSE;
if (!strncmp((const char*)buf, "OVERRNG", 7)) if (!strncmp((const char *)buf, "OVERRNG", 7))
return TRUE; return TRUE;
if (sscanf((const char*)buf, "%f", &val) == 1) if (sscanf((const char *)buf, "%f", &val) == 1)
return TRUE; return TRUE;
else else
return FALSE; return FALSE;
@ -63,14 +63,14 @@ SR_PRIV int sr_m2110_parse(const uint8_t *buf, float *floatval,
(void)info; (void)info;
analog->mq = SR_MQ_GAIN; /* We don't know the unit, so that's the best we can do.*/ /* We don't know the unit, so that's the best we can do. */
analog->mq = SR_MQ_GAIN;
analog->unit = SR_UNIT_UNITLESS; analog->unit = SR_UNIT_UNITLESS;
analog->mqflags = 0; analog->mqflags = 0;
if (!strncmp((const char*)buf, "OVERRNG", 7)) { if (!strncmp((const char *)buf, "OVERRNG", 7))
*floatval = INFINITY; *floatval = INFINITY;
} else if (sscanf((const char *)buf, "%f", &val) == 1)
else if (sscanf((const char*)buf, "%f", &val) == 1)
*floatval = val; *floatval = val;
return SR_OK; return SR_OK;

10
hardware/serial-dmm/protocol.h
View File

@ -61,15 +61,15 @@ enum {
#define DMM_COUNT 25 #define DMM_COUNT 25
struct dmm_info { struct dmm_info {
/** Manufacturer/brand */ /** Manufacturer/brand. */
char *vendor; char *vendor;
/** Model */ /** Model. */
char *device; char *device;
/** serialconn string */ /** serialconn string. */
char *conn; char *conn;
/** Baud rate */ /** Baud rate. */
uint32_t baudrate; uint32_t baudrate;
/** Packet size [bytes]. */ /** Packet size in bytes. */
int packet_size; int packet_size;
/** Packet request function. */ /** Packet request function. */
int (*packet_request)(struct sr_serial_dev_inst *); int (*packet_request)(struct sr_serial_dev_inst *);