From ed07df16da675c4c123e02a996822daf13d69c63 Mon Sep 17 00:00:00 2001
From: lhoerl <coder@lolux.de>
Date: 周一, 03 8月 2015 22:42:07 +0800
Subject: [PATCH] added full SCPI error messages added list for device dependent error messages some minor changes to get rid of compiler warnings added support for Keil ARM compiler added support for National Instruments CVI compiler removed bug if(c = '\0')...
---
libscpi/src/units.c | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/libscpi/src/units.c b/libscpi/src/units.c
index d4f3784..517bb1a 100644
--- a/libscpi/src/units.c
+++ b/libscpi/src/units.c
@@ -38,6 +38,7 @@
#include "scpi/parser.h"
#include "scpi/units.h"
#include "utils_private.h"
+#include "scpi/utils.h"
#include "scpi/error.h"
#include "lexer_private.h"
@@ -205,7 +206,7 @@
lex_state_t state;
scpi_parameter_t param;
scpi_bool_t result;
- int32_t intval;
+ int32_t tag;
if (!value) {
SCPI_ErrorPush(context, SCPI_ERROR_SYSTEM_ERROR);
@@ -230,7 +231,7 @@
case SCPI_TOKEN_DECIMAL_NUMERIC_PROGRAM_DATA_WITH_SUFFIX:
case SCPI_TOKEN_PROGRAM_MNEMONIC:
value->unit = SCPI_UNIT_NONE;
- value->type = SCPI_NUM_NUMBER;
+ value->special = FALSE;
result = TRUE;
break;
}
@@ -279,10 +280,10 @@
scpiLex_CharacterProgramData(&state, &token);
/* convert string to special number type */
- SCPI_ParamToChoice(context, &token, special, &intval);
+ SCPI_ParamToChoice(context, &token, special, &tag);
- value->type = intval;
- value->value = 0;
+ value->special = TRUE;
+ value->tag = tag;
break;
default:
@@ -309,12 +310,17 @@
return 0;
}
- if (SCPI_ChoiceToName(special, value->type, &type)) {
- strncpy(str, type, len);
- return min(strlen(type), len);
+ if (value->special) {
+ if (SCPI_ChoiceToName(special, value->tag, &type)) {
+ strncpy(str, type, len);
+ return min(strlen(type), len);
+ } else {
+ str[0] = 0;
+ return 0;
+ }
}
- result = doubleToStr(value->value, str, len);
+ result = SCPI_DoubleToStr(value->value, str, len);
unit = translateUnitInverse(context->units, value->unit);
--
Gitblit v1.9.1