Diff: src/error.c

Revision:

1:b497f235115a

Parent:

0:aad43948c45c

--- a/src/error.c	Thu Apr 09 22:42:15 2015 +0000
+++ b/src/error.c	Fri Aug 07 21:54:11 2015 +0000
@@ -2,7 +2,7 @@
  * Copyright (c) 2012-2013 Jan Breuer,
  *
  * All Rights Reserved
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
@@ -11,7 +11,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -28,10 +28,10 @@
 /**
  * @file   scpi_error.c
  * @date   Thu Nov 15 10:58:45 UTC 2012
- * 
+ *
  * @brief  Error handling and storing routines
- * 
- * 
+ *
+ *
  */
 
 #include <stdint.h>
@@ -39,13 +39,16 @@
 #include "scpi/parser.h"
 #include "scpi/ieee488.h"
 #include "scpi/error.h"
-#include "scpi/fifo.h"
+#include "fifo_private.h"
 
 /* basic FIFO */
-static fifo_t local_error_queue;
+static scpi_fifo_t local_error_queue;
 
 
-
+/**
+ * Initialize error queue
+ * @param context - scpi context
+ */
 void SCPI_ErrorInit(scpi_t * context) {
     /*
      * // FreeRTOS
@@ -54,7 +57,34 @@
 
     /* basic FIFO */
     context->error_queue = (scpi_error_queue_t)&local_error_queue;
-    fifo_init((fifo_t *)context->error_queue);
+    fifo_init((scpi_fifo_t *)context->error_queue);
+}
+
+/**
+ * Emit no error
+ * @param context scpi context
+ */
+static void SCPI_ErrorEmitEmpty(scpi_t * context) {
+    if ((SCPI_ErrorCount(context) == 0) && (SCPI_RegGet(context, SCPI_REG_STB) & STB_QMA)) {
+        SCPI_RegClearBits(context, SCPI_REG_STB, STB_QMA);
+
+        if (context->interface && context->interface->error) {
+            context->interface->error(context, 0);
+        }
+    }
+}
+
+/**
+ * Emit error
+ * @param context scpi context
+ * @param err Error to emit
+ */
+static void SCPI_ErrorEmit(scpi_t * context, int16_t err) {
+    SCPI_RegSetBits(context, SCPI_REG_STB, STB_QMA);
+
+    if (context->interface && context->interface->error) {
+        context->interface->error(context, err);
+    }
 }
 
 /**
@@ -68,7 +98,9 @@
      */
 
     /* basic FIFO */
-    fifo_clear((fifo_t *)context->error_queue);
+    fifo_clear((scpi_fifo_t *)context->error_queue);
+
+    SCPI_ErrorEmitEmpty(context);
 }
 
 /**
@@ -87,7 +119,9 @@
      */
 
     /* basic FIFO */
-    fifo_remove((fifo_t *)context->error_queue, &result);
+    fifo_remove((scpi_fifo_t *)context->error_queue, &result);
+
+    SCPI_ErrorEmitEmpty(context);
 
     return result;
 }
@@ -95,7 +129,7 @@
 /**
  * Return number of errors/events in the queue
  * @param context
- * @return 
+ * @return
  */
 int32_t SCPI_ErrorCount(scpi_t * context) {
     int16_t result = 0;
@@ -106,7 +140,7 @@
      */
 
     /* basic FIFO */
-    fifo_count((fifo_t *)context->error_queue, &result);
+    fifo_count((scpi_fifo_t *)context->error_queue, &result);
 
     return result;
 }
@@ -118,7 +152,7 @@
      */
 
     /* basic FIFO */
-    fifo_add((fifo_t *)context->error_queue, err);
+    fifo_add((scpi_fifo_t *)context->error_queue, err);
 }
 
 struct error_reg {
@@ -127,12 +161,13 @@
     scpi_reg_val_t bit;
 };
 
-#define ERROR_DEFS_N    8
+#define ERROR_DEFS_N    9
 
 static const struct error_reg errs[ERROR_DEFS_N] = {
     {-100, -199, ESR_CER}, /* Command error (e.g. syntax error) ch 21.8.9    */
     {-200, -299, ESR_EER}, /* Execution Error (e.g. range error) ch 21.8.10  */
     {-300, -399, ESR_DER}, /* Device specific error -300, -399 ch 21.8.11    */
+    {   1,32767, ESR_DER}, /* Device designer provided specific error 1, 32767 ch 21.8.11    */
     {-400, -499, ESR_QER}, /* Query error -400, -499 ch 21.8.12              */
     {-500, -599, ESR_PON}, /* Power on event -500, -599 ch 21.8.13           */
     {-600, -699, ESR_URQ}, /* User Request Event -600, -699 ch 21.8.14       */
@@ -157,11 +192,9 @@
         }
     }
 
+    SCPI_ErrorEmit(context, err);
+
     if (context) {
-        if (context->interface && context->interface->error) {
-            context->interface->error(context, err);
-        }
-
         context->cmd_error = TRUE;
     }
 }
@@ -174,11 +207,19 @@
 const char * SCPI_ErrorTranslate(int16_t err) {
     switch (err) {
         case 0: return "No error";
-        #define X(def, val, str) case def: return str;
-        LIST_OF_ERRORS
-        #undef X        
+#define X(def, val, str) case def: return str;
+#if USE_FULL_ERROR_LIST
+#define XE X
+#else
+#define XE(def, val, str)
+#endif
+LIST_OF_ERRORS
+
+#if USE_USER_ERROR_LIST
+LIST_OF_USER_ERRORS
+#endif
+#undef X
+#undef XE
         default: return "Unknown error";
     }
 }
-
-