show error message on LCD if GPIB chip not detectedINSTRUMENT_6_0_15

4 files changed, 12 insertions, 1 deletions

diff --git a/error_utils.c b/error_utils.c
index a98c7af..d159e50 100644
--- a/error_utils.c
+++ b/error_utils.c
@@ -64,6 +64,7 @@ void set_gpib_error_flags (int error_num)
 	case SelfCalError:
 	case NetworkNotFound:
 	case Startup_Not_Finished:
+	case GPIB_missing:
 		GPIB_Set_Device_Dependent_Error();
 		break;
 	default:
@@ -475,6 +476,10 @@ void get_error_text(gchar **response, int error_num)
 		format_error_text(response,-240,"Not possible with the current calibration settings.");
 		break;
 
+        case GPIB_missing:
+                format_error_text(response,-240,"GPIB chip not detected. Defective hardware?");
+                break;
+
 	case CalibrationTimingProblem:
 		format_error_text(response,-221,"Set timing to allow operation at minimum and maximum amplitudes.");
 		break;
diff --git a/globals.h b/globals.h
index 9c52ee4..6922045 100644
--- a/globals.h
+++ b/globals.h
@@ -93,6 +93,7 @@
 #define PRF_limited_by_offset 79
 #define obsolete_feature 80
 #define zero_equiv_ampl_too_large 81
+#define GPIB_missing 82
 
 
 #define YES     1
diff --git a/instr-daemon.c b/instr-daemon.c
index 8db710f..91eac0d 100644
--- a/instr-daemon.c
+++ b/instr-daemon.c
@@ -349,6 +349,11 @@ static gboolean finish_boot (void)
 
 	Show_Main_Menu();
 
+	// report error if GPIB chip not found
+	if (!globals.HWDetect.gpib) {
+		queue_error_and_display_on_LCD(GPIB_missing);
+	}
+
 	return FALSE;	// no more calls to this function are needed
 }
 
diff --git a/version.h b/version.h
index 20135b5..ebb1632 100644
--- a/version.h
+++ b/version.h
@@ -1,2 +1,2 @@
-#define FW_VERSION "6.0.14"
+#define FW_VERSION "6.0.15"
 #define SCPI_version "1996.0"