From 323ec66d62f19673e66762fe25585746d3b2a5e0 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周三, 18 3月 2015 17:09:30 +0800
Subject: [PATCH] Add new AUTO special value, resolve #20
---
libscpi/src/units.c | 73 ++++++++++++++++++------------------
1 files changed, 37 insertions(+), 36 deletions(-)
diff --git a/libscpi/src/units.c b/libscpi/src/units.c
index 29ad74d..a4c7592 100644
--- a/libscpi/src/units.c
+++ b/libscpi/src/units.c
@@ -37,7 +37,7 @@
#include <string.h>
#include "scpi/parser.h"
#include "scpi/units.h"
-#include "utils.h"
+#include "scpi/utils_private.h"
#include "scpi/error.h"
@@ -62,39 +62,39 @@
*/
const scpi_unit_def_t scpi_units_def[] = {
/* voltage */
- { .name = "UV", .unit = SCPI_UNIT_VOLT, .mult = 1e-6},
- { .name = "MV", .unit = SCPI_UNIT_VOLT, .mult = 1e-3},
- { .name = "V", .unit = SCPI_UNIT_VOLT, .mult = 1},
- { .name = "KV", .unit = SCPI_UNIT_VOLT, .mult = 1e3},
+ {/* name */ "UV", /* unit */ SCPI_UNIT_VOLT, /* mult */ 1e-6},
+ {/* name */ "MV", /* unit */ SCPI_UNIT_VOLT, /* mult */ 1e-3},
+ {/* name */ "V", /* unit */ SCPI_UNIT_VOLT, /* mult */ 1},
+ {/* name */ "KV", /* unit */ SCPI_UNIT_VOLT, /* mult */ 1e3},
/* current */
- { .name = "UA", .unit = SCPI_UNIT_AMPER, .mult = 1e-6},
- { .name = "MA", .unit = SCPI_UNIT_AMPER, .mult = 1e-3},
- { .name = "A", .unit = SCPI_UNIT_AMPER, .mult = 1},
- { .name = "KA", .unit = SCPI_UNIT_AMPER, .mult = 1e3},
+ {/* name */ "UA", /* unit */ SCPI_UNIT_AMPER, /* mult */ 1e-6},
+ {/* name */ "MA", /* unit */ SCPI_UNIT_AMPER, /* mult */ 1e-3},
+ {/* name */ "A", /* unit */ SCPI_UNIT_AMPER, /* mult */ 1},
+ {/* name */ "KA", /* unit */ SCPI_UNIT_AMPER, /* mult */ 1e3},
/* resistance */
- { .name = "OHM", .unit = SCPI_UNIT_OHM, .mult = 1},
- { .name = "KOHM", .unit = SCPI_UNIT_OHM, .mult = 1e3},
- { .name = "MOHM", .unit = SCPI_UNIT_OHM, .mult = 1e6},
+ {/* name */ "OHM", /* unit */ SCPI_UNIT_OHM, /* mult */ 1},
+ {/* name */ "KOHM", /* unit */ SCPI_UNIT_OHM, /* mult */ 1e3},
+ {/* name */ "MOHM", /* unit */ SCPI_UNIT_OHM, /* mult */ 1e6},
/* frequency */
- { .name = "HZ", .unit = SCPI_UNIT_HERTZ, .mult = 1},
- { .name = "KHZ", .unit = SCPI_UNIT_HERTZ, .mult = 1e3},
- { .name = "MHZ", .unit = SCPI_UNIT_HERTZ, .mult = 1e6},
- { .name = "GHZ", .unit = SCPI_UNIT_HERTZ, .mult = 1e9},
+ {/* name */ "HZ", /* unit */ SCPI_UNIT_HERTZ, /* mult */ 1},
+ {/* name */ "KHZ", /* unit */ SCPI_UNIT_HERTZ, /* mult */ 1e3},
+ {/* name */ "MHZ", /* unit */ SCPI_UNIT_HERTZ, /* mult */ 1e6},
+ {/* name */ "GHZ", /* unit */ SCPI_UNIT_HERTZ, /* mult */ 1e9},
/* temperature */
- { .name = "CEL", .unit = SCPI_UNIT_CELSIUS, .mult = 1},
+ {/* name */ "CEL", /* unit */ SCPI_UNIT_CELSIUS, /* mult */ 1},
/* time */
- { .name = "PS", .unit = SCPI_UNIT_SECONDS, .mult = 1e-12},
- { .name = "NS", .unit = SCPI_UNIT_SECONDS, .mult = 1e-9},
- { .name = "US", .unit = SCPI_UNIT_SECONDS, .mult = 1e-6},
- { .name = "MS", .unit = SCPI_UNIT_SECONDS, .mult = 1e-3},
- { .name = "S", .unit = SCPI_UNIT_SECONDS, .mult = 1},
- { .name = "MIN", .unit = SCPI_UNIT_SECONDS, .mult = 60},
- { .name = "HR", .unit = SCPI_UNIT_SECONDS, .mult = 3600},
+ {/* name */ "PS", /* unit */ SCPI_UNIT_SECONDS, /* mult */ 1e-12},
+ {/* name */ "NS", /* unit */ SCPI_UNIT_SECONDS, /* mult */ 1e-9},
+ {/* name */ "US", /* unit */ SCPI_UNIT_SECONDS, /* mult */ 1e-6},
+ {/* name */ "MS", /* unit */ SCPI_UNIT_SECONDS, /* mult */ 1e-3},
+ {/* name */ "S", /* unit */ SCPI_UNIT_SECONDS, /* mult */ 1},
+ {/* name */ "MIN", /* unit */ SCPI_UNIT_SECONDS, /* mult */ 60},
+ {/* name */ "HR", /* unit */ SCPI_UNIT_SECONDS, /* mult */ 3600},
SCPI_UNITS_LIST_END,
};
@@ -103,14 +103,15 @@
* Special number values definition
*/
const scpi_special_number_def_t scpi_special_numbers_def[] = {
- { .name = "MINimum", .type = SCPI_NUM_MIN},
- { .name = "MAXimum", .type = SCPI_NUM_MAX},
- { .name = "DEFault", .type = SCPI_NUM_DEF},
- { .name = "UP", .type = SCPI_NUM_UP},
- { .name = "DOWN", .type = SCPI_NUM_DOWN},
- { .name = "NAN", .type = SCPI_NUM_NAN},
- { .name = "INF", .type = SCPI_NUM_INF},
- { .name = "NINF", .type = SCPI_NUM_NINF},
+ {/* name */ "MINimum", /* type */ SCPI_NUM_MIN},
+ {/* name */ "MAXimum", /* type */ SCPI_NUM_MAX},
+ {/* name */ "DEFault", /* type */ SCPI_NUM_DEF},
+ {/* name */ "UP", /* type */ SCPI_NUM_UP},
+ {/* name */ "DOWN", /* type */ SCPI_NUM_DOWN},
+ {/* name */ "NAN", /* type */ SCPI_NUM_NAN},
+ {/* name */ "INFinity", /* type */ SCPI_NUM_INF},
+ {/* name */ "NINF", /* type */ SCPI_NUM_NINF},
+ {/* name */ "AUTO", /* type */ SCPI_NUM_AUTO},
SCPI_SPECIAL_NUMBERS_LIST_END,
};
@@ -122,7 +123,7 @@
* @param value resultin value
* @return TRUE if str matches one of specs patterns
*/
-static bool_t translateSpecialNumber(const scpi_special_number_def_t * specs, const char * str, size_t len, scpi_number_t * value) {
+static scpi_bool_t translateSpecialNumber(const scpi_special_number_def_t * specs, const char * str, size_t len, scpi_number_t * value) {
int i;
value->value = 0.0;
@@ -218,7 +219,7 @@
* @param value preparsed numeric value
* @return TRUE if value parameter was converted to base units
*/
-static bool_t transformNumber(scpi_t * context, const char * unit, size_t len, scpi_number_t * value) {
+static scpi_bool_t transformNumber(scpi_t * context, const char * unit, size_t len, scpi_number_t * value) {
size_t s;
const scpi_unit_def_t * unitDef;
s = skipWhitespace(unit, len);
@@ -248,8 +249,8 @@
* @param mandatory if the parameter is mandatory
* @return
*/
-bool_t SCPI_ParamNumber(scpi_t * context, scpi_number_t * value, bool_t mandatory) {
- bool_t result;
+scpi_bool_t SCPI_ParamNumber(scpi_t * context, scpi_number_t * value, scpi_bool_t mandatory) {
+ scpi_bool_t result;
const char * param;
size_t len;
size_t numlen;
--
Gitblit v1.9.1