From 6e5e3e0e3fc450eaf53feee059824ad85c4f270d Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周四, 06 8月 2015 22:32:35 +0800
Subject: [PATCH] Resolve #38 Error queue not empty bit

---
 examples/common/scpi-def.c |   43 +++++++++++++++++++++++--------------------
 1 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/examples/common/scpi-def.c b/examples/common/scpi-def.c
index dbb869b..e1089cc 100644
--- a/examples/common/scpi-def.c
+++ b/examples/common/scpi-def.c
@@ -40,18 +40,18 @@
 #include "scpi/scpi.h"
 #include "scpi-def.h"
 
-scpi_result_t DMM_MeasureVoltageDcQ(scpi_t * context) {
+static scpi_result_t DMM_MeasureVoltageDcQ(scpi_t * context) {
     scpi_number_t param1, param2;
     char bf[15];
     fprintf(stderr, "meas:volt:dc\r\n"); // debug command name   
 
     // read first parameter if present
-    if (!SCPI_ParamNumber(context, scpi_special_numbers_def, &param1, false)) {
+    if (!SCPI_ParamNumber(context, scpi_special_numbers_def, &param1, FALSE)) {
         // do something, if parameter not present
     }
 
     // read second paraeter if present
-    if (!SCPI_ParamNumber(context, scpi_special_numbers_def, &param2, false)) {
+    if (!SCPI_ParamNumber(context, scpi_special_numbers_def, &param2, FALSE)) {
         // do something, if parameter not present
     }
 
@@ -69,18 +69,18 @@
 }
 
 
-scpi_result_t DMM_MeasureVoltageAcQ(scpi_t * context) {
+static scpi_result_t DMM_MeasureVoltageAcQ(scpi_t * context) {
     scpi_number_t param1, param2;
     char bf[15];
     fprintf(stderr, "meas:volt:ac\r\n"); // debug command name   
 
     // read first parameter if present
-    if (!SCPI_ParamNumber(context, scpi_special_numbers_def, &param1, false)) {
+    if (!SCPI_ParamNumber(context, scpi_special_numbers_def, &param1, FALSE)) {
         // do something, if parameter not present
     }
 
     // read second paraeter if present
-    if (!SCPI_ParamNumber(context, scpi_special_numbers_def, &param2, false)) {
+    if (!SCPI_ParamNumber(context, scpi_special_numbers_def, &param2, FALSE)) {
         // do something, if parameter not present
     }
 
@@ -97,17 +97,17 @@
     return SCPI_RES_OK;
 }
 
-scpi_result_t DMM_ConfigureVoltageDc(scpi_t * context) {
+static scpi_result_t DMM_ConfigureVoltageDc(scpi_t * context) {
     double param1, param2;
     fprintf(stderr, "conf:volt:dc\r\n"); // debug command name   
 
     // read first parameter if present
-    if (!SCPI_ParamDouble(context, &param1, true)) {
+    if (!SCPI_ParamDouble(context, &param1, TRUE)) {
         return SCPI_RES_ERR;
     }
 
     // read second paraeter if present
-    if (!SCPI_ParamDouble(context, &param2, false)) {
+    if (!SCPI_ParamDouble(context, &param2, FALSE)) {
         // do something, if parameter not present
     }
 
@@ -117,12 +117,12 @@
     return SCPI_RES_OK;
 }
 
-scpi_result_t TEST_Bool(scpi_t * context) {
+static scpi_result_t TEST_Bool(scpi_t * context) {
     scpi_bool_t param1;
     fprintf(stderr, "TEST:BOOL\r\n"); // debug command name   
 
     // read first parameter if present
-    if (!SCPI_ParamBool(context, &param1, true)) {
+    if (!SCPI_ParamBool(context, &param1, TRUE)) {
         return SCPI_RES_ERR;
     }
 
@@ -139,12 +139,12 @@
 };
 
 
-scpi_result_t TEST_ChoiceQ(scpi_t * context) {
+static scpi_result_t TEST_ChoiceQ(scpi_t * context) {
 
     int32_t param;
     const char * name;
     
-    if (!SCPI_ParamChoice(context, trigger_source, &param, true)) {
+    if (!SCPI_ParamChoice(context, trigger_source, &param, TRUE)) {
         return SCPI_RES_ERR;
     }
     
@@ -156,30 +156,33 @@
     return SCPI_RES_OK;
 }
 
-scpi_result_t TEST_Numbers(scpi_t * context) {
+static scpi_result_t TEST_Numbers(scpi_t * context) {
+    int32_t numbers[2];
 
-    fprintf(stderr, "RAW CMD %.*s\r\n", (int)context->param_list.cmd_raw.length, context->param_list.cmd_raw.data);
+    SCPI_CommandNumbers(context, numbers, 2);
+
+    fprintf(stderr, "TEST numbers %d %d\r\n", numbers[0], numbers[1]);
 
     return SCPI_RES_OK;
 }
 
-scpi_result_t TEST_Text(scpi_t * context) {
+static scpi_result_t TEST_Text(scpi_t * context) {
     char buffer[100];
     size_t copy_len;
 
     buffer[0] = 0;
-    SCPI_ParamCopyText(context, buffer, 100, &copy_len, false);
+    SCPI_ParamCopyText(context, buffer, 100, &copy_len, FALSE);
 
     fprintf(stderr, "TEXT: ***%s***\r\n", buffer);
 
     return SCPI_RES_OK;
 }
 
-scpi_result_t TEST_ArbQ(scpi_t * context) {
+static scpi_result_t TEST_ArbQ(scpi_t * context) {
     const char * data;
     size_t len;
 
-    SCPI_ParamArbitraryBlock(context, &data, &len, false);
+    SCPI_ParamArbitraryBlock(context, &data, &len, FALSE);
 
     SCPI_ResultArbitraryBlock(context, data, len);
 
@@ -194,7 +197,7 @@
  *
  * Return SCPI_RES_OK
  */
-scpi_result_t My_CoreTstQ(scpi_t * context) {
+static scpi_result_t My_CoreTstQ(scpi_t * context) {
 
     SCPI_ResultInt(context, 0);
 

--
Gitblit v1.9.1