diff options
| -rw-r--r-- | error_utils.c | 5 | ||||
| -rw-r--r-- | globals.h | 1 | ||||
| -rw-r--r-- | instr-daemon.c | 5 | ||||
| -rw-r--r-- | version.h | 2 |
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; @@ -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 } @@ -1,2 +1,2 @@ -#define FW_VERSION "6.0.14" +#define FW_VERSION "6.0.15" #define SCPI_version "1996.0" |